@hpcc-js/common 2.73.0 → 3.2.0

package/src/PropertyExt.ts

@@ -1,6 +1,6 @@
 import { hashSum } from "@hpcc-js/util";
 import { event as d3Event } from "d3-selection";
-import { Class } from "./Class";
+import { Class } from "./Class.ts";
 
 const GEN_PUB_STUBS: boolean = false;
 
@@ -493,7 +493,7 @@ export class PropertyExt extends Class {
         if (this[id]) {
         } else {
             if (type === "propertyArray") {
-                this[id] = function (_) {
+                this[id] = function (_?) {
                     if (!arguments.length) return this[__prop_ + id];
                     this[__prop_ + id] = _.map(item => {
                         if (!meta.ext.noDeserialize && meta.ext.autoExpand && !(item instanceof meta.ext.autoExpand)) {
@@ -505,8 +505,8 @@ export class PropertyExt extends Class {
                     return this;
                 };
             } else {
-                this[id] = function (_) {
-                    if (!arguments.length) return this[__prop_ + id];
+                this[id] = function (_?) {
+                    if (!arguments.length) return this[__prop_ + id]  ?? this[id + "_default"]();
                     this[__prop_ + id] = _;
                     return this;
                 };
@@ -532,7 +532,7 @@ export class PropertyExt extends Class {
             if (this[id + "_default"]() != null && !(this[id + "_default"]() === "" && ext.optional === true)) return true;
             return false;
         };
-        this[id + "_default"] = function (_) {
+        this[id + "_default"] = function (_?) {
             if (!arguments.length) return this[__default_ + id] !== undefined ? this[__default_ + id] : meta.defaultValue;
             if (_ === "") {
                 _ = null;
@@ -594,7 +594,7 @@ export class PropertyExt extends Class {
             throw new Error(id + " is already published.");
         }
         this[__meta_ + id] = new MetaProxy(id, proxy, method, defaultValue);
-        this[id] = function (_) {
+        this[id] = function (_?) {
             if (!arguments.length) return defaultValue === undefined || this[id + "_modified"]() ? this[proxy][method]() : defaultValue;
             if (defaultValue !== undefined && _ === defaultValue) {
                 this[proxy][method + "_reset"]();
@@ -612,7 +612,7 @@ export class PropertyExt extends Class {
         this[id + "_exists"] = function () {
             return this[proxy][method + "_exists"]();
         };
-        this[id + "_default"] = function (_) {
+        this[id + "_default"] = function (_?) {
             if (!arguments.length) return this[proxy][method + "_default"]();
             this[proxy][method + "_default"](_);
             return this;
@@ -768,26 +768,3 @@ export class PropertyExt extends Class {
     }
 }
 PropertyExt.prototype._class += " common_PropertyExt";
-
-export function publish(defaultValue, type?: PublishTypes, description?: string, set?: string[] | (() => string[] | Array<{ value: string, text: string }>) | IPublishExt, ext: IPublishExt = {}) {
-    return function (target: any, key: string) {
-        if (!key) throw new Error("???");
-        if (ext.reset) {
-            target.publishReset();
-        }
-        target.publish(key, defaultValue, type, description, set, ext);
-    };
-}
-export type publish<T, U> = {
-    (_: U): T;
-    (): U;
-};
-
-export function publishProxy(proxy: string, method?: string, defaultValue?, ext: { reset?: boolean } = {}) {
-    return function (target: any, key: string) {
-        if (ext.reset) {
-            target.publishReset();
-        }
-        target.publishProxy(key, proxy, method, defaultValue);
-    };
-}

package/src/ResizeSurface.ts

@@ -1,7 +1,7 @@
 import { dispatch as d3Dispatch } from "d3-dispatch";
 import { drag as d3Drag } from "d3-drag";
 import { event as d3Event, select as d3Select } from "d3-selection";
-import { Surface } from "./Surface";
+import { Surface } from "./Surface.ts";
 
 import "../src/ResizeSurface.css";
 
@@ -214,8 +214,12 @@ export class ResizeSurface extends Surface {
             })
             ;
     }
-    allowResize: { (): boolean; (_: boolean): ResizeSurface; };
 }
 ResizeSurface.prototype._class += " common_ResizeSurface";
 
+export interface ResizeSurface {
+    allowResize(): boolean;
+    allowResize(_: boolean): this;
+}
+
 ResizeSurface.prototype.publish("allowResize", true, "boolean", "Sets if surface can be resized", null, { tags: ["Private", "Shared"] });

package/src/SVGWidget.ts

@@ -1,10 +1,10 @@
 import { rgb as d3Rgb } from "d3-color";
 import { select as d3Select } from "d3-selection";
-import { fontAwsesomeStyle } from "./FAChar";
-import { svgMarkerGlitch } from "./Platform";
-import { Transition } from "./Transition";
-import { debounce, downloadBlob, downloadString, timestamp } from "./Utility";
-import { ISize, Widget } from "./Widget";
+import { fontAwsesomeStyle } from "./FAChar.ts";
+import { svgMarkerGlitch } from "./Platform.ts";
+import { Transition } from "./Transition.ts";
+import { debounce, downloadBlob, downloadString, timestamp } from "./Utility.ts";
+import { ISize, Widget } from "./Widget.ts";
 
 type Point = { x: number, y: number };
 type Rect = { x: number, y: number, width: number, height: number };
@@ -144,8 +144,6 @@ export class SVGGlowFilter {
 export class SVGWidget extends Widget {
     static _class = "common_SVGWidget";
 
-    _tag;
-
     protected _boundingBox;
     protected transition;
     protected _drawStartPos: "center" | "origin";
@@ -166,7 +164,7 @@ export class SVGWidget extends Widget {
     }
 
     //  Properties  ---
-    move(_, transitionDuration?) {
+    move(_?, transitionDuration?) {
         const retVal = this.pos(_);
         if (arguments.length) {
             (transitionDuration ? this._element.transition().duration(transitionDuration) : this._element)

package/src/SVGZoomWidget.ts

@@ -1,8 +1,8 @@
 import { event as d3Event, mouse as d3Mouse } from "d3-selection";
 import { zoom as d3Zoom, zoomIdentity as d3ZoomIdentity } from "d3-zoom";
-import { SVGWidget } from "./SVGWidget";
-import { safeRaise } from "./Utility";
-import { Button, IconBar, Spacer, ToggleButton } from "./TitleBar";
+import { SVGWidget } from "./SVGWidget.ts";
+import { safeRaise } from "./Utility.ts";
+import { Button, IconBar, Spacer, ToggleButton } from "./TitleBar.ts";
 
 import "../src/SVGZoomWidget.css";
 
@@ -329,6 +329,7 @@ export class SVGZoomWidget extends SVGWidget {
             .attr("class", "zoomBackground")
             .attr("width", this.width())
             .attr("height", this.height())
+            .style("fill", "transparent")
             .on("mousedown", () => {
                 if (d3Event.shiftKey && this.mouseMode() === "zoom") {
                     d3Event.stopPropagation();

package/src/Shape.ts

@@ -1,5 +1,5 @@
 import { select as d3Select } from "d3-selection";
-import { SVGWidget } from "./SVGWidget";
+import { SVGWidget } from "./SVGWidget.ts";
 
 import "../src/Shape.css";
 

package/src/Surface.ts

@@ -1,10 +1,10 @@
 import { select as d3Select } from "d3-selection";
 import "d3-transition";
-import { Icon } from "./Icon";
-import { Menu } from "./Menu";
-import { Shape } from "./Shape";
-import { SVGWidget } from "./SVGWidget";
-import { Text } from "./Text";
+import { Icon } from "./Icon.ts";
+import { Menu } from "./Menu.ts";
+import { Shape } from "./Shape.ts";
+import { SVGWidget } from "./SVGWidget.ts";
+import { Text } from "./Text.ts";
 
 import "../src/Surface.css";
 
@@ -296,21 +296,36 @@ export class Surface extends SVGWidget {
     click(d) {
     }
 
-    showTitle: { (): boolean; (_: boolean): Surface; };
-    title: { (): string; (_: string): Surface; };
-    titleFontSize: { (): string; (_: string): Surface; };
-    showIcon: { (): boolean; (_: boolean): Surface; };
-    icon_faChar: { (): string; (_: string): Surface; };
-    icon_shape: { (): string; (_: string): Surface; };
-    content: { (): any; (_: any): Surface; };
-    buttonAnnotations: { (): any[]; (_: any[]): Surface; };
-    buttonGutter: { (): number; (_: number): Surface; };
-    showContent: { (): boolean; (_: boolean): Surface; };
-    menu: { (): any[]; (_: any[]): Surface; };
-    menuPadding: { (): number; (_: number): Surface; };
 }
 Surface.prototype._class += " common_Surface";
 
+export interface Surface {
+    showTitle(): boolean;
+    showTitle(_: boolean): this;
+    title(): string;
+    title(_: string): this;
+    titleFontSize(): string;
+    titleFontSize(_: string): this;
+    showIcon(): boolean;
+    showIcon(_: boolean): this;
+    icon_faChar(): string;
+    icon_faChar(_: string): this;
+    icon_shape(): string;
+    icon_shape(_: string): this;
+    content(): any;
+    content(_: any): this;
+    buttonAnnotations(): any[];
+    buttonAnnotations(_: any[]): this;
+    buttonGutter(): number;
+    buttonGutter(_: number): this;
+    showContent(): boolean;
+    showContent(_: boolean): this;
+    menu(): any[];
+    menu(_: any[]): this;
+    menuPadding(): number;
+    menuPadding(_: number): this;
+}
+
 Surface.prototype.publish("showTitle", true, "boolean", "Show Title", null, { tags: ["Basic"] });
 Surface.prototype.publish("title", "", "string", "Title", null, { tags: ["Basic"] });
 Surface.prototype.publishProxy("titleFontSize", "_textWidget", "fontSize");

package/src/Text.ts

@@ -1,4 +1,4 @@
-import { SVGWidget } from "./SVGWidget";
+import { SVGWidget } from "./SVGWidget.ts";
 
 import "../src/Text.css";
 

package/src/TextBox.ts

@@ -1,8 +1,8 @@
-import { textColor } from "./Palette";
-import { Shape } from "./Shape";
-import { SVGWidget } from "./SVGWidget";
-import { Text } from "./Text";
-import { ISize } from "./Widget";
+import { textColor } from "./Palette.ts";
+import { Shape } from "./Shape.ts";
+import { SVGWidget } from "./SVGWidget.ts";
+import { Text } from "./Text.ts";
+import { ISize } from "./Widget.ts";
 
 import "../src/TextBox.css";
 
@@ -135,23 +135,38 @@ export class TextBox extends SVGWidget {
 
     dblclick() {
     }
-
-    text: { (): string; (_: string): TextBox; };
-    fontSize: { (): number; (_: number): TextBox; };
-    shape_colorFill: { (): string; (_: string): TextBox; };
-    shape_colorStroke: { (): string; (_: string): TextBox; };
-    text_colorFill: { (): string; (_: string): TextBox; };
-    text_fontFamily: { (): string; (_: string): TextBox; };
-    paddingLeft: { (): number; (_: number): TextBox; };
-    paddingRight: { (): number; (_: number): TextBox; };
-    paddingTop: { (): number; (_: number): TextBox; };
-    paddingBottom: { (): number; (_: number): TextBox; };
-    anchor: { (): "start" | "middle" | "end"; (_: "start" | "middle" | "end"): TextBox; };
-    fixedSize: { (): ISize; (_: ISize): TextBox; };
-    tooltip: { (): string; (_: string): TextBox; };
 }
 TextBox.prototype._class += " common_TextBox";
 
+export interface TextBox {
+    text(): string;
+    text(_: string): this;
+    fontSize(): number;
+    fontSize(_: number): this;
+    shape_colorFill(): string;
+    shape_colorFill(_: string): this;
+    shape_colorStroke(): string;
+    shape_colorStroke(_: string): this;
+    text_colorFill(): string;
+    text_colorFill(_: string): this;
+    text_fontFamily(): string;
+    text_fontFamily(_: string): this;
+    paddingLeft(): number;
+    paddingLeft(_: number): this;
+    paddingRight(): number;
+    paddingRight(_: number): this;
+    paddingTop(): number;
+    paddingTop(_: number): this;
+    paddingBottom(): number;
+    paddingBottom(_: number): this;
+    anchor(): "start" | "middle" | "end";
+    anchor(_: "start" | "middle" | "end"): this;
+    fixedSize(): ISize;
+    fixedSize(_: ISize): this;
+    tooltip(): string;
+    tooltip(_: string): this;
+}
+
 TextBox.prototype.publishProxy("text", "_text");
 TextBox.prototype.publishProxy("fontSize", "_text", "fontSize");
 TextBox.prototype.publishProxy("shape_colorStroke", "_shape", "colorStroke");

package/src/TitleBar.ts

@@ -1,7 +1,7 @@
 import { event as d3Event } from "d3-selection";
-import { HTMLWidget } from "./HTMLWidget";
-import { fa5Class } from "./Utility";
-import { Widget } from "./Widget";
+import { HTMLWidget } from "./HTMLWidget.ts";
+import { fa5Class } from "./Utility.ts";
+import { Widget } from "./Widget.ts";
 
 import "../src/TitleBar.css";
 

package/src/Transition.ts

@@ -14,19 +14,19 @@ export class Transition {
         this._ease = d3CubicInOut;
     }
 
-    duration(_) {
+    duration(_?) {
         if (!arguments.length) return this._duration;
         this._duration = _;
         return this._widget;
     }
 
-    delay(_) {
+    delay(_?) {
         if (!arguments.length) return this._delay;
         this._delay = _;
         return this._widget;
     }
 
-    ease(_) {
+    ease(_?) {
         if (!arguments.length) return this._ease;
         this._ease = _;
         return this._widget;

package/src/Utility.ts

@@ -158,7 +158,7 @@ export class SimpleSelection extends SelectionBase {
     }
 
     _skipBringToTop;
-    skipBringToTop(_) {
+    skipBringToTop(_?) {
         if (!arguments.length) return this._skipBringToTop;
         this._skipBringToTop = _;
         return this;
@@ -220,7 +220,7 @@ export class SimpleSelection extends SelectionBase {
     selected(domNode) {
         return d3Select(domNode).classed("selected");
     }
-    selection(_) {
+    selection(_?) {
         if (!arguments.length) {
             return this.selection2().map(row => JSON.stringify(row));
         }
@@ -418,7 +418,7 @@ export function templateFields(tpl: string): string[] {
     return retVal;
 }
 
-export function template(tpl: string, _args) {
+export function template(tpl?: string, _args?) {
     if (!tpl) return "";
     let args;
 

package/src/Widget.ts

@@ -1,12 +1,14 @@
 import { select as d3Select } from "d3-selection";
 import "d3-transition";
-import { Field, Grid } from "./Database";
-import { } from "./Platform";
-import { PropertyExt } from "./PropertyExt";
-import { debounce, textRect, TextRect, textSize, TextSize } from "./Utility";
+import { Field, Grid } from "./Database.ts";
+import { } from "./Platform.ts";
+import { PropertyExt } from "./PropertyExt.ts";
+import { debounce, textRect, TextRect, textSize, TextSize } from "./Utility.ts";
 
 import "../src/Widget.css";
 
+export { Field };
+
 export type IPrimative = boolean | number | string | object;
 export type IFieldType = "boolean" | "number" | "string" | "dataset" | "object" | "any";
 export interface InputField {
@@ -44,7 +46,7 @@ export interface DataMetaT {
 
 let widgetID = 0;
 export abstract class Widget extends PropertyExt {
-    _idSeed: string;
+    static _idSeed: string;
 
     protected _tag: string;
     protected _isRootNode: boolean = true;
@@ -70,8 +72,7 @@ export abstract class Widget extends PropertyExt {
 
     constructor() {
         super();
-        this._class = Object.getPrototypeOf(this)._class;
-        this._id = this._idSeed + widgetID++;
+        this._id = Widget._idSeed + widgetID++;
 
         this._db = new Grid();
         this._pos = { x: 0, y: 0 };
@@ -313,8 +314,8 @@ export abstract class Widget extends PropertyExt {
     }
 
     scale(): number;
-    scale(_): Widget;
-    scale(_?): number | Widget {
+    scale(_): this;
+    scale(_?): number | this {
         if (!arguments.length) return this._widgetScale;
         this._widgetScale = _;
         if (this._overlayElement) {
@@ -714,7 +715,7 @@ export interface Widget {
     classed(_: { [classID: string]: boolean }): this;
 }
 
-Widget.prototype._idSeed = "_w";
+Widget._idSeed = "_w";
 
 Widget.prototype.publishProxy("fields", "_db", "fields");
 Widget.prototype.publish("classed", {}, "object", "HTML Classes", null, { tags: ["Private"] });

package/src/WidgetArray.ts

@@ -1,13 +1,15 @@
-import { publish } from "./PropertyExt";
-import { Widget } from "./Widget";
+import { Widget } from "./Widget.ts";
 
 export class WidgetArray extends Widget {
 
-    @publish([], "widgetArray", "Widget Array")
-    content: publish<this, Widget[]>;
-
     constructor() {
         super();
     }
 }
 WidgetArray.prototype._class += " common_WidgetArray";
+
+export interface WidgetArray {
+    content(): Widget[];
+    content(_: Widget[]): this;
+}
+WidgetArray.prototype.publish("content", [], "widgetArray", "Widget Array");

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/common";
-export const PKG_VERSION = "2.73.0";
-export const BUILD_VERSION = "2.107.0";
+export const PKG_VERSION = "3.2.0";
+export const BUILD_VERSION = "3.2.0";

package/src/index.ts

@@ -1,39 +1,39 @@
-export * from "./__package__";
-export * from "./CanvasWidget";
-export * from "./Class";
-import * as Database from "./Database";
+export * from "./__package__.ts";
+export * from "./CanvasWidget.ts";
+export * from "./Class.ts";
+import * as Database from "./Database.ts";
 export { Database };
-export * from "./Entity";
-export * from "./EntityCard";
-export * from "./EntityPin";
-export * from "./EntityRect";
-export * from "./EntityVertex";
-export * from "./FAChar";
-export * from "./HTMLWidget";
-export * from "./Icon";
-export * from "./IList";
-export * from "./Image";
-export * from "./IMenu";
-export * from "./List";
-export * from "./Menu";
-import * as Palette from "./Palette";
+export * from "./Entity.ts";
+export * from "./EntityCard.ts";
+export * from "./EntityPin.ts";
+export * from "./EntityRect.ts";
+export * from "./EntityVertex.ts";
+export * from "./FAChar.ts";
+export * from "./HTMLWidget.ts";
+export * from "./Icon.ts";
+export * from "./IList.ts";
+export * from "./Image.ts";
+export * from "./IMenu.ts";
+export * from "./List.ts";
+export * from "./Menu.ts";
+import * as Palette from "./Palette.ts";
 export { Palette };
-import * as Platform from "./Platform";
+import * as Platform from "./Platform.ts";
 export { Platform };
-export * from "./ProgressBar";
-export * from "./PropertyExt";
-export * from "./ResizeSurface";
-export * from "./Shape";
-export * from "./Surface";
-export * from "./SVGWidget";
-export * from "./SVGZoomWidget";
-export * from "./Text";
-export * from "./TextBox";
-export * from "./TitleBar";
-import * as Utility from "./Utility";
+export * from "./ProgressBar.ts";
+export * from "./PropertyExt.ts";
+export * from "./ResizeSurface.ts";
+export * from "./Shape.ts";
+export * from "./Surface.ts";
+export * from "./SVGWidget.ts";
+export * from "./SVGZoomWidget.ts";
+export * from "./Text.ts";
+export * from "./TextBox.ts";
+export * from "./TitleBar.ts";
+import * as Utility from "./Utility.ts";
 export { Utility };
-export * from "./Widget";
-export * from "./WidgetArray";
+export * from "./Widget.ts";
+export * from "./WidgetArray.ts";
 
 export * from "d3-array";
 export * from "d3-brush";

package/types/CanvasWidget.d.ts

@@ -1,4 +1,4 @@
-import { HTMLWidget } from "./HTMLWidget";
+import { HTMLWidget } from "./HTMLWidget.ts";
 export declare class CanvasWidget extends HTMLWidget {
     _ctx: CanvasRenderingContext2D;
     constructor();
@@ -6,4 +6,3 @@ export declare class CanvasWidget extends HTMLWidget {
     resetContext(): void;
     click(d: any, c: any): void;
 }
-//# sourceMappingURL=CanvasWidget.d.ts.map

package/types/Class.d.ts

@@ -1,6 +1,8 @@
 import { ClassMeta } from "@hpcc-js/util";
 export declare class Class {
+    static _class: string;
     _class: string;
+    constructor();
     class(): string;
     class(_: string): this;
     classID(): string;
@@ -10,4 +12,3 @@ export declare class Class {
     overrideMethod<M extends keyof this>(methodID: M, newMethod: this[M]): this;
     cssTag(id: string): string;
 }
-//# sourceMappingURL=Class.d.ts.map

package/types/Database.d.ts

@@ -1,4 +1,4 @@
-import { PropertyExt } from "./PropertyExt";
+import { PropertyExt } from "./PropertyExt.ts";
 export interface INestedColumn {
     label: string;
     columns: Array<string | INestedColumn>;
@@ -22,26 +22,18 @@ export declare class Field extends PropertyExt {
     formatter(format: any): any;
     children(): Field[];
     children(_: Array<string | INestedColumn | Field>, asDefault?: boolean): this;
-    label_default: {
-        (): string;
-        (x: string): Field;
-    };
-    label: {
-        (): string;
-        (x: string): Field;
-    };
-    mask: {
-        (): string;
-        (x: string): Field;
-    };
-    format: {
-        (): string;
-        (x: string): Field;
-    };
 }
 export interface Field {
+    label(): string;
+    label(_: string): this;
+    label_default(): string;
+    label_default(_: string): this;
     type(): FieldType;
     type(_: FieldType): this;
+    mask(): string;
+    mask(_: string): this;
+    format(): string;
+    format(_: string): this;
 }
 export declare class Grid extends PropertyExt {
     _dataChecksum: boolean;
@@ -134,4 +126,3 @@ export declare class RollupView extends LegacyView {
     _walkData(entries: any, prevRow?: any[]): any[];
     data(opts: any): any[];
 }
-//# sourceMappingURL=Database.d.ts.map

package/types/Entity.d.ts

@@ -1,8 +1,8 @@
-import { Icon } from "./Icon";
-import { Shape } from "./Shape";
-import { SVGWidget } from "./SVGWidget";
-import { Text } from "./Text";
-import { BBox, Widget } from "./Widget";
+import { Icon } from "./Icon.ts";
+import { Shape } from "./Shape.ts";
+import { SVGWidget } from "./SVGWidget.ts";
+import { Text } from "./Text.ts";
+import { BBox, Widget } from "./Widget.ts";
 export interface IAnnotation {
     faChar: string;
     tooltip?: string;
@@ -86,4 +86,3 @@ export interface Entity {
     backgroundColorStroke(): string;
     backgroundColorStroke(_: string): this;
 }
-//# sourceMappingURL=Entity.d.ts.map

package/types/EntityCard.d.ts

@@ -1,4 +1,4 @@
-import { Entity } from "./Entity";
+import { Entity } from "./Entity.ts";
 export declare class EntityCard extends Entity {
     protected _element_textbox: any;
     constructor();
@@ -11,4 +11,3 @@ export interface EntityCard {
     fixedHeight(): number;
     fixedHeight(_: number): this;
 }
-//# sourceMappingURL=EntityCard.d.ts.map

package/types/EntityPin.d.ts

@@ -1,4 +1,4 @@
-import { Entity } from "./Entity";
+import { Entity } from "./Entity.ts";
 export declare class EntityPin extends Entity {
     protected _element_textbox: any;
     constructor();
@@ -20,4 +20,3 @@ export interface EntityPin {
     annotationOnlyShowOnHover(): boolean;
     annotationOnlyShowOnHover(_: boolean): this;
 }
-//# sourceMappingURL=EntityPin.d.ts.map