@hpcc-js/form 2.12.0 → 3.2.0

package/src/Input.ts

@@ -1,5 +1,5 @@
 import { IInput } from "@hpcc-js/api";
-import { HTMLWidget } from "@hpcc-js/common";
+import { Database, HTMLWidget } from "@hpcc-js/common";
 
 import "../src/Input.css";
 
@@ -90,32 +90,47 @@ export class Input extends HTMLWidget {
         }
     }
 
-    type: { (): string; (_: string): Input };
-    type_exists: () => boolean;
-    type_default: { (): string; (_: string): Input };
-    inlineLabel: { (): string; (_: string): Input };
-    inlineLabel_exists: () => boolean;
-
-    //  IInput  ---
-    name: { (): string; (_: string): Input };
-    name_exists: () => boolean;
-    label: { (): string; (_: string): Input };
-    label_exists: () => boolean;
-    value: { (): any; (_: any): Input };
-    value_exists: () => boolean;
-    validate: { (): string; (_: string): Input };
-    validate_exists: () => boolean;
-
     //  IInput Events ---
-    blur: (w: Input) => void;
-    keyup: (w: Input) => void;
-    focus: (w: Input) => void;
-    click: (w: Input) => void;
-    dblclick: (w: Input) => void;
-    change: (w: Input, complete: boolean) => void;
+    blur(w: Input) {
+    }
+    keyup(w: Input) {
+    }
+    focus(w: Input) {
+    }
+    click(w: Input) {
+    }
+    dblclick(w: Input) {
+    }
+    change(w: Input, complete: boolean) {
+    }
 }
 Input.prototype._class += " form_Input";
 Input.prototype.implements(IInput.prototype);
 
-Input.prototype.publish("type", "text", "set", "Input type", ["number", "button", "checkbox", "date", "text", "textarea", "search", "email", "time", "datetime", "hidden"]);
+export interface Input {
+    //  IInput  ---
+    name(): string;
+    name(_: string): this;
+    name_exists(): boolean;
+    label(): string;
+    label(_: string): this;
+    label_exists(): boolean;
+    value(): any;
+    value(_: any): this;
+    value_exists(): boolean;
+    validate(): string;
+    validate(_: string): this;
+    validate_exists(): boolean;
+
+    //  Properties  ---
+    type(): Database.FieldType | "button" | "checkbox" | "text" | "textarea" | "search" | "email" | "datetime";
+    type(_: Database.FieldType | "button" | "checkbox" | "text" | "textarea" | "search" | "email" | "datetime"): this;
+    type_exists(): boolean;
+    type_default(): string;
+    inlineLabel(): string;
+    inlineLabel(_: string): this;
+    inlineLabel_exists(): boolean;
+}
+
+Input.prototype.publish("type", "text", "set", "Input type", ["string", "number", "boolean", "date", "time", "hidden", "nested", "button", "checkbox", "text", "textarea", "search", "email", "datetime"]);
 Input.prototype.publish("inlineLabel", null, "string", "Input Label", null, { optional: true });

package/src/InputRange.ts

@@ -62,25 +62,34 @@ export class InputRange extends HTMLWidget {
                 .property("value", this._rangeData.length > idx ? this._rangeData[idx] : "");
         }, this);
     }
-
-    type: { (): string; (_: string): InputRange };
-    type_exists: () => boolean;
-    inlineLabel: { (): string; (_: string): InputRange };
-    inlineLabel_exists: () => boolean;
-    value: { (): any[]; (_: any[]): InputRange };
-    value_exists: () => boolean;
-
-    //  IInput  ---
-    name: { (): string; (_: string): InputRange };
-    name_exists: () => boolean;
-    label: { (): string; (_: string): InputRange };
-    label_exists: () => boolean;
-    validate: { (): string; (_: string): InputRange };
-    validate_exists: () => boolean;
 }
 InputRange.prototype._class += " form_InputRange";
 InputRange.prototype.implements(IInput.prototype);
 
+export interface InputRange {
+    //  IInput  ---
+    name(): string;
+    name(_: string): this;
+    name_exists(): boolean;
+    label(): string;
+    label(_: string): this;
+    label_exists(): boolean;
+    value(): any[];
+    value(_: any[]): this;
+    value_exists(): boolean;
+    validate(): string;
+    validate(_: string): this;
+    validate_exists(): boolean;
+
+    //  Properties  ---
+    type(): string;
+    type(_: string): this;
+    type_exists(): boolean;
+    inlineLabel(): string;
+    inlineLabel(_: string): this;
+    inlineLabel_exists(): boolean;
+}
+
 InputRange.prototype.publish("type", "text", "set", "InputRange type", ["number", "date", "text", "time", "datetime", "hidden"]);
 InputRange.prototype.publish("inlineLabel", null, "string", "InputRange Label", null, { optional: true });
 InputRange.prototype.publish("value", ["", ""], "array", "Input Current Value", null, { override: true });

package/src/OnOff.ts

@@ -96,19 +96,24 @@ export class OnOff extends HTMLWidget {
             .style("background-color", this.onColor())
             ;
     }
-
-    //  IInput  ---
-    name: { (): string; (_: string): OnOff };
-    name_exists: () => boolean;
-    label: { (): string; (_: string): OnOff };
-    label_exists: () => boolean;
-    value: { (): any; (_: any): OnOff };
-    value_exists: () => boolean;
-    validate: { (): string; (_: string): OnOff };
-    validate_exists: () => boolean;
 }
 OnOff.prototype._class += " form_OnOff";
 export interface OnOff {
+    //  IInput  ---
+    name(): string;
+    name(_: string): this;
+    name_exists(): boolean;
+    label(): string;
+    label(_: string): this;
+    label_exists(): boolean;
+    value(): any;
+    value(_: any): this;
+    value_exists(): boolean;
+    validate(): string;
+    validate(_: string): this;
+    validate_exists(): boolean;
+
+    //  Properties  ---
     marginLeft(): number;
     marginLeft(_: number): this;
     marginBottom(): number;

package/src/Radio.ts

@@ -55,21 +55,29 @@ export class Radio extends HTMLWidget {
             }
         });
     }
-
-    selectOptions: { (): any[]; (_: any[]): Radio };
-    selectOptions_exists: () => boolean;
-
-    //  IInput  ---
-    name: { (): string; (_: string): Radio };
-    name_exists: () => boolean;
-    label: { (): string; (_: string): Radio };
-    label_exists: () => boolean;
-    value: { (): any; (_: any): Radio };
-    value_exists: () => boolean;
-    validate: { (): string; (_: string): Radio };
-    validate_exists: () => boolean;
 }
 Radio.prototype._class += " form_Radio";
 Radio.prototype.implements(IInput.prototype);
 
+export interface Radio {
+    //  IInput  ---
+    name(): string;
+    name(_: string): this;
+    name_exists(): boolean;
+    label(): string;
+    label(_: string): this;
+    label_exists(): boolean;
+    value(): any;
+    value(_: any): this;
+    value_exists(): boolean;
+    validate(): string;
+    validate(_: string): this;
+    validate_exists(): boolean;
+
+    //  Properties  ---
+    selectOptions(): any[];
+    selectOptions(_: any[]): this;
+    selectOptions_exists(): boolean;
+}
+
 Radio.prototype.publish("selectOptions", [], "array", "Array of options used to fill a dropdown list");

package/src/Range.ts

@@ -72,31 +72,43 @@ export class Range extends HTMLWidget {
         }
         this._inputElement[0].html(optionHTML);
     }
-
-    type: { (): string; (_: string): Range };
-    type_exists: () => boolean;
-    selectOptions: { (): any[]; (_: any[]): Range };
-    selectOptions_exists: () => boolean;
-    low: { (): number; (_: number): Range };
-    low_exists: () => boolean;
-    high: { (): number; (_: number): Range };
-    high_exists: () => boolean;
-    step: { (): number; (_: number): Range };
-    step_exists: () => boolean;
-
-    //  IInput  ---
-    name: { (): string; (_: string): Range };
-    name_exists: () => boolean;
-    label: { (): string; (_: string): Range };
-    label_exists: () => boolean;
-    value: { (): any; (_: any): Range };
-    value_exists: () => boolean;
-    validate: { (): string; (_: string): Range };
-    validate_exists: () => boolean;
 }
 Range.prototype._class += " form_Range";
 Range.prototype.implements(IInput.prototype);
 
+export interface Range {
+    //  IInput  ---
+    name(): string;
+    name(_: string): this;
+    name_exists(): boolean;
+    label(): string;
+    label(_: string): this;
+    label_exists(): boolean;
+    value(): any;
+    value(_: any): this;
+    value_exists(): boolean;
+    validate(): string;
+    validate(_: string): this;
+    validate_exists(): boolean;
+
+    //  Properties  ---
+    type(): string;
+    type(_: string): this;
+    type_exists(): boolean;
+    selectOptions(): any[];
+    selectOptions(_: any[]): this;
+    selectOptions_exists(): boolean;
+    low(): number;
+    low(_: number): this;
+    low_exists(): boolean;
+    high(): number;
+    high(_: number): this;
+    high_exists(): boolean;
+    step(): number;
+    step(_: number): this;
+    step_exists(): boolean;
+}
+
 Range.prototype.publish("type", "text", "set", "Input type", ["html-color", "number", "checkbox", "button", "select", "textarea", "date", "text", "range", "search", "email", "time", "datetime"]);
 Range.prototype.publish("selectOptions", [], "array", "Array of options used to fill a dropdown list");
 Range.prototype.publish("low", null, "number", "Minimum value for Range input");

package/src/Select.ts

@@ -57,24 +57,33 @@ export class Select extends HTMLWidget {
         }
         this._inputElement[0].html(optionHTML);
     }
-
-    selectOptions: { (): any[]; (_: any[]): Select };
-    selectOptions_exists: () => boolean;
-    maxWidth: { (): number; (_: number): Select };
-    maxWidth_exists: () => boolean;
-
-    //  IInput  ---
-    name: { (): string; (_: string): Select };
-    name_exists: () => boolean;
-    label: { (): string; (_: string): Select };
-    label_exists: () => boolean;
-    value: { (): any; (_: any): Select };
-    value_exists: () => boolean;
-    validate: { (): string; (_: string): Select };
-    validate_exists: () => boolean;
 }
 Select.prototype._class += " form_Select";
 Select.prototype.implements(IInput.prototype);
 
+export interface Select {
+    //  IInput  ---
+    name(): string;
+    name(_: string): this;
+    name_exists(): boolean;
+    label(): string;
+    label(_: string): this;
+    label_exists(): boolean;
+    value(): any;
+    value(_: any): this;
+    value_exists(): boolean;
+    validate(): string;
+    validate(_: string): this;
+    validate_exists(): boolean;
+
+    //  Properties  ---
+    selectOptions(): any[];
+    selectOptions(_: any[]): this;
+    selectOptions_exists(): boolean;
+    maxWidth(): number;
+    maxWidth(_: number): this;
+    maxWidth_exists(): boolean;
+}
+
 Select.prototype.publish("selectOptions", [], "array", "Array of options used to fill a dropdown list");
 Select.prototype.publish("maxWidth", 120, "number", "Width", null, { optional: true });

package/src/Slider.ts

@@ -270,13 +270,17 @@ export class Slider extends SVGWidget {
         return retVal;
     };
 
-    name: (_?: string) => string | this;
-    change: (_: Slider) => void;
 }
 Slider.prototype._class += " form_Slider";
 Slider.prototype.implements(IInput.prototype);
 
 export interface Slider {
+    //  IInput  ---
+    name(): string;
+    name(_: string): this;
+    change(_: Slider): void;
+
+    //  Properties ---
     padding(): number;
     padding(_: number): this;
     fontSize(): number;
@@ -357,7 +361,7 @@ Slider.prototype.publish("tickDateFormat", null, "string");
 Slider.prototype.publish("tickValueFormat", ",.0f", "string");
 
 const name = Slider.prototype.name;
-Slider.prototype.name = function (_: any): any {
+Slider.prototype.name = function (_?: any): any {
     const retVal = name.apply(this, arguments);
     if (arguments.length) {
         const val = _ instanceof Array ? _ : [_];

package/src/TextArea.ts

@@ -1,4 +1,4 @@
-import { Input } from "./Input";
+import { Input } from "./Input.ts";
 
 export class TextArea extends Input {
     constructor() {
@@ -27,20 +27,27 @@ export class TextArea extends Input {
             ;
     }
 
-    rows: { (): number; (_: number): TextArea };
-    rows_exists: () => boolean;
-    cols: { (): number; (_: number): TextArea };
-    cols_exists: () => boolean;
-    wrap: { (): string; (_: string): TextArea };
-    wrap_exists: () => boolean;
-    minHeight: { (): number; (_: number): TextArea };
-    minHeight_exists: () => boolean;
-    spellcheck: { (): boolean; (_: boolean): TextArea };
-    spellcheck_exists: () => boolean;
-    value: { (): any; (_: any): TextArea };
 }
 TextArea.prototype._class += " form_TextArea";
 
+export interface TextArea {
+    rows(): number;
+    rows(_: number): this;
+    rows_exists(): boolean;
+    cols(): number;
+    cols(_: number): this;
+    cols_exists(): boolean;
+    wrap(): string;
+    wrap(_: string): this;
+    wrap_exists(): boolean;
+    minHeight(): number;
+    minHeight(_: number): this;
+    minHeight_exists(): boolean;
+    spellcheck(): boolean;
+    spellcheck(_: boolean): this;
+    spellcheck_exists(): boolean;
+}
+
 TextArea.prototype.publish("rows", null, "number", "Rows", null, { optional: true });
 TextArea.prototype.publish("cols", null, "number", "Columns", null, { optional: true });
 TextArea.prototype.publish("wrap", "off", "set", "Wrap", ["off", "on"]);

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/form";
-export const PKG_VERSION = "2.12.0";
-export const BUILD_VERSION = "2.107.0";
+export const PKG_VERSION = "3.1.0";
+export const BUILD_VERSION = "3.2.1";

package/src/index.ts

@@ -1,14 +1,14 @@
-export * from "./__package__";
-export * from "./Button";
-export * from "./CheckBox";
-export * from "./ColorInput";
-export * from "./Form";
-export * from "./FieldForm";
-export * from "./Input";
-export * from "./InputRange";
-export * from "./OnOff";
-export * from "./Radio";
-export * from "./Range";
-export * from "./Select";
-export * from "./Slider";
-export * from "./TextArea";
+export * from "./__package__.ts";
+export * from "./Button.ts";
+export * from "./CheckBox.ts";
+export * from "./ColorInput.ts";
+export * from "./Form.ts";
+export * from "./FieldForm.ts";
+export * from "./Input.ts";
+export * from "./InputRange.ts";
+export * from "./OnOff.ts";
+export * from "./Radio.ts";
+export * from "./Range.ts";
+export * from "./Select.ts";
+export * from "./Slider.ts";
+export * from "./TextArea.ts";

package/types/Button.d.ts

@@ -5,25 +5,14 @@ export declare class Button extends HTMLWidget {
     constructor();
     enter(domNode: any, element: any): void;
     update(domNode: any, element: any): void;
-    name: {
-        (): string;
-        (_: string): Button;
-    };
-    name_exists: () => boolean;
-    label: {
-        (): string;
-        (_: string): Button;
-    };
-    label_exists: () => boolean;
-    value: {
-        (): any;
-        (_: any): Button;
-    };
-    value_exists: () => boolean;
-    validate: {
-        (): string;
-        (_: string): Button;
-    };
-    validate_exists: () => boolean;
 }
-//# sourceMappingURL=Button.d.ts.map
+export interface Button {
+    name(): string;
+    name(_: string): Button;
+    label(): string;
+    label(_: string): Button;
+    value(): any;
+    value(_: any): Button;
+    validate(): string;
+    validate(_: string): Button;
+}

package/types/CheckBox.d.ts

@@ -6,30 +6,21 @@ export declare class CheckBox extends HTMLWidget {
     enter(domNode: any, element: any): void;
     update(domNode: any, element: any): void;
     insertSelectOptions(optionsArr: any): void;
-    selectOptions: {
-        (): any[];
-        (_: any[]): CheckBox;
-    };
-    selectOptions_exists: () => boolean;
-    name: {
-        (): string;
-        (_: string): CheckBox;
-    };
-    name_exists: () => boolean;
-    label: {
-        (): string;
-        (_: string): CheckBox;
-    };
-    label_exists: () => boolean;
-    value: {
-        (): any;
-        (_: any): CheckBox;
-    };
-    value_exists: () => boolean;
-    validate: {
-        (): string;
-        (_: string): CheckBox;
-    };
-    validate_exists: () => boolean;
 }
-//# sourceMappingURL=CheckBox.d.ts.map
+export interface CheckBox {
+    name(): string;
+    name(_: string): this;
+    name_exists(): boolean;
+    label(): string;
+    label(_: string): this;
+    label_exists(): boolean;
+    value(): any;
+    value(_: any): this;
+    value_exists(): boolean;
+    validate(): string;
+    validate(_: string): this;
+    validate_exists(): boolean;
+    selectOptions(): any[];
+    selectOptions(_: any[]): this;
+    selectOptions_exists(): boolean;
+}

package/types/ColorInput.d.ts

@@ -5,25 +5,18 @@ export declare class ColorInput extends HTMLWidget {
     constructor();
     enter(domNode: any, element: any): void;
     update(domNode: any, element: any): void;
-    name: {
-        (): string;
-        (_: string): ColorInput;
-    };
-    name_exists: () => boolean;
-    label: {
-        (): string;
-        (_: string): ColorInput;
-    };
-    label_exists: () => boolean;
-    value: {
-        (): any;
-        (_: any): ColorInput;
-    };
-    value_exists: () => boolean;
-    validate: {
-        (): string;
-        (_: string): ColorInput;
-    };
-    validate_exists: () => boolean;
 }
-//# sourceMappingURL=ColorInput.d.ts.map
+export interface ColorInput {
+    name(): string;
+    name(_: string): this;
+    name_exists(): boolean;
+    label(): string;
+    label(_: string): this;
+    label_exists(): boolean;
+    value(): any;
+    value(_: any): this;
+    value_exists(): boolean;
+    validate(): string;
+    validate(_: string): this;
+    validate_exists(): boolean;
+}

package/types/FieldForm.d.ts

@@ -1,5 +1,5 @@
 import { Database } from "@hpcc-js/common";
-import { Form } from "./Form";
+import { Form } from "./Form.ts";
 import "../src/Form.css";
 export declare class FieldForm extends Form {
     constructor();
@@ -8,4 +8,3 @@ export declare class FieldForm extends Form {
     data(): any;
     data(_: any): this;
 }
-//# sourceMappingURL=FieldForm.d.ts.map

package/types/Form.d.ts

@@ -23,31 +23,22 @@ export declare class Form extends HTMLWidget {
     update(domNode: any, element: any): void;
     exit(domNode: any, element: any): void;
     click(row: any, col: any, sel: any): void;
-    validate: {
-        (): boolean;
-        (_: boolean): Form;
-    };
-    validate_exists: () => boolean;
-    inputs: {
-        (): any[];
-        (_: any[]): Form;
-    };
-    inputs_exists: () => boolean;
-    inputs_reset: () => void;
-    showSubmit: {
-        (): boolean;
-        (_: boolean): Form;
-    };
-    showSubmit_exists: () => boolean;
-    omitBlank: {
-        (): boolean;
-        (_: boolean): Form;
-    };
-    omitBlank_exists: () => boolean;
-    allowEmptyRequest: {
-        (): boolean;
-        (_: boolean): Form;
-    };
-    allowEmptyRequest_exists: () => boolean;
 }
-//# sourceMappingURL=Form.d.ts.map
+export interface Form {
+    validate(): boolean;
+    validate(_: boolean): this;
+    validate_exists(): boolean;
+    inputs(): any[];
+    inputs(_: any[]): this;
+    inputs_exists(): boolean;
+    inputs_reset(): void;
+    showSubmit(): boolean;
+    showSubmit(_: boolean): this;
+    showSubmit_exists(): boolean;
+    omitBlank(): boolean;
+    omitBlank(_: boolean): this;
+    omitBlank_exists(): boolean;
+    allowEmptyRequest(): boolean;
+    allowEmptyRequest(_: boolean): this;
+    allowEmptyRequest_exists(): boolean;
+}