@hpcc-js/marshaller 2.28.11 → 3.1.1

package/src/ddl2/model/visualization.ts

@@ -1,15 +1,15 @@
 import { Area, Bar, Bubble, Column, Contour, HexBin, Line, Pie, Radar, RadialBar, Scatter, Step, WordCloud } from "@hpcc-js/chart";
-import { Database, EntityRectList, InputField, PropertyExt, publish, publishProxy, Widget } from "@hpcc-js/common";
+import { Database, EntityRectList, InputField, PropertyExt, Widget } from "@hpcc-js/common";
 import { DDL2 } from "@hpcc-js/ddl-shim";
 import { Table } from "@hpcc-js/dgrid";
 import { FieldForm } from "@hpcc-js/form";
 import { AdjacencyGraph, DataGraph } from "@hpcc-js/graph";
 import { ChoroplethCounties, ChoroplethStates, Leaflet } from "@hpcc-js/map";
 import { isArray } from "@hpcc-js/util";
-import { HipiePipeline } from "../activities/hipiepipeline";
-import { ComputedField, Mappings, MultiField } from "../activities/project";
-import { ElementContainer } from "./element";
-import { VizChartPanel } from "./vizChartPanel";
+import { HipiePipeline } from "../activities/hipiepipeline.ts";
+import { ComputedField, Mappings, MultiField } from "../activities/project.ts";
+import { ElementContainer } from "./element.ts";
+import { VizChartPanel } from "./vizChartPanel.ts";
 
 export type VizType = "Table" | "FieldForm" |
     "Area" | "Bubble" | "Bar" | "Column" | "Contour" | "HexBin" | "Line" | "Pie" | "WordCloud" | "Radar" | "RadialBar" | "Scatter" | "Step" |
@@ -59,71 +59,14 @@ function typeInputs(type: VizType): InputField[] {
 }
 
 export class Visualization extends PropertyExt {
-    @publishProxy("_chartPanel")
-    title: publish<this, string>;
-    @publishProxy("_chartPanel")
-    description: publish<this, string>;
-    @publish(DDL2.VisibilitySet[0], "set", "Type", DDL2.VisibilitySet)
-    _visibility: DDL2.VisibilityType;
-    visibility(): DDL2.VisibilityType;
-    visibility(_: DDL2.VisibilityType): this;
-    visibility(_?: DDL2.VisibilityType): DDL2.VisibilityType | this {
-        if (!arguments.length) return this._visibility;
-        if (this._visibility !== _) {
-            this.chartPanel().target(null);
-        }
-        this._visibility = _;
-        return this;
-    }
-
-    @publish("Table", "set", "Type", VizTypeSet)
-    _chartType: VizType;
-    chartType(): VizType;
-    chartType(_: VizType, props?: { [prop: string]: any }): this;
-    chartType(_?: VizType, props?: { [prop: string]: any }): VizType | this {
-        if (!arguments.length) return this._chartType;
-        if (VizTypeSet.indexOf(_) === -1) {
-            _ = "Table";
-        }
-        this._chartType = _;
-        this.typeChanged();
-        if (props) {
-            const widget = this.chartPanel().widget();
-            for (const prop in props) {
-                if (typeof widget[prop] === "function") {
-                    widget[prop](props[prop]);
-                }
-            }
-        }
-        return this;
-    }
 
-    @publish(null, "set", "Secondary Data View (e.g. graph edges)", function (this: Visualization) { return this.visualizationIDs(); }, { optional: true })
-    secondaryDataviewID: publish<this, string>;
-    secondaryDataviewID_exists: () => boolean;
-    secondaryDataviewID_valid: () => boolean;
+    _origVisibility;
+    _origChartType;
+    _origChartPanel;
 
-    @publish(null, "widget", "Mappings", undefined, { render: false, internal: true })
-    mappings: publish<this, Mappings>;
-    @publish([], "widget", "Widget")
-    _chartPanel: VizChartPanel;
-    chartPanel(): VizChartPanel;
-    chartPanel(_: VizChartPanel): this;
-    chartPanel(_?: VizChartPanel): VizChartPanel | this {
-        if (!arguments.length) return this._chartPanel;
-        this._chartPanel = _;
-        this._chartPanel
-            .on("click", (row: any, col: string, sel: boolean, more) => this.click(row, col, sel, more))
-            .on("vertex_click", (row: any, col: string, sel: boolean) => this.vertex_click(row, col, sel))
-            ;
-        for (const key in VizTypeMap) {
-            if (this._chartPanel.widget() instanceof VizTypeMap[key]) {
-                this._chartType = key as VizType;
-                break;
-            }
-        }
-        return this;
-    }
+    declare _visibility: DDL2.VisibilityType;
+    declare _chartType: VizType;
+    declare _chartPanel: VizChartPanel;
 
     protected _hipiePipeline: HipiePipeline;
     constructor(protected _ec: ElementContainer, hipiePipeline: HipiePipeline) {
@@ -334,9 +277,13 @@ export class Visualization extends PropertyExt {
     }
 
     refresh(): Promise<void> {
-        this.chartPanel().startProgress && this.chartPanel().startProgress();
+        if (this.chartPanel().startProgress) {
+            this.chartPanel().startProgress();
+        }
         return this.exec().then(() => {
-            this.chartPanel().finishProgress && this.chartPanel().finishProgress();
+            if (this.chartPanel().finishProgress) {
+                this.chartPanel().finishProgress();
+            }
             return this.refreshData();
         });
     }
@@ -349,3 +296,78 @@ export class Visualization extends PropertyExt {
     }
 }
 Visualization.prototype._class += " Visualization";
+
+export interface Visualization {
+    title(): string;
+    title(_: string): this;
+    description(): string;
+    description(_: string): this;
+    visibility(): DDL2.VisibilityType;
+    visibility(_: DDL2.VisibilityType): this;
+    chartType(): VizType;
+    chartType(_: VizType, props?: { [prop: string]: any }): this;
+    secondaryDataviewID(): string;
+    secondaryDataviewID(_: string): this;
+    secondaryDataviewID_exists(): boolean;
+    secondaryDataviewID_valid(): boolean;
+    mappings(): Mappings;
+    mappings(_: Mappings): this;
+    chartPanel(): VizChartPanel;
+    chartPanel(_: VizChartPanel): this;
+}
+
+Visualization.prototype.publishProxy("title", "_chartPanel");
+Visualization.prototype.publishProxy("description", "_chartPanel");
+Visualization.prototype.publish("visibility", DDL2.VisibilitySet[0], "set", "Type", DDL2.VisibilitySet);
+Visualization.prototype.publish("chartType", "Table", "set", "Type", VizTypeSet);
+Visualization.prototype.publish("secondaryDataviewID", null, "set", "Secondary Data View (e.g. graph edges)", function (this: Visualization) { return this.visualizationIDs(); }, { optional: true });
+Visualization.prototype.publish("mappings", null, "widget", "Mappings", undefined, { render: false, internal: true });
+Visualization.prototype.publish("chartPanel", [], "widget", "Widget");
+
+Visualization.prototype._origVisibility = Visualization.prototype.visibility;
+Visualization.prototype.visibility = function (this: Visualization, _?) {
+    const prev = this._visibility;
+    const retVal = Visualization.prototype._origVisibility.apply(this, arguments);
+    if (_ !== undefined && prev !== _) {
+        this.chartPanel().target(null);
+    }
+    return retVal;
+};
+
+Visualization.prototype._origChartType = Visualization.prototype.chartType;
+Visualization.prototype.chartType = function (this: Visualization, _?, props?) {
+    if (_ !== undefined && VizTypeSet.indexOf(_) === -1) {
+        _ = "Table";
+    }
+    const retVal = Visualization.prototype._origChartType.call(this, _);
+    if (_ !== undefined) {
+        this.typeChanged();
+        if (props) {
+            const widget = this.chartPanel().widget();
+            for (const prop in props) {
+                if (typeof widget[prop] === "function") {
+                    widget[prop](props[prop]);
+                }
+            }
+        }
+    }
+    return retVal;
+};
+
+Visualization.prototype._origChartPanel = Visualization.prototype.chartPanel;
+Visualization.prototype.chartPanel = function (this: Visualization, _?) {
+    const retVal = Visualization.prototype._origChartPanel.apply(this, arguments);
+    if (_ !== undefined) {
+        this._chartPanel
+            .on("click", (row: any, col: string, sel: boolean, more) => this.click(row, col, sel, more))
+            .on("vertex_click", (row: any, col: string, sel: boolean) => this.vertex_click(row, col, sel))
+            ;
+        for (const key in VizTypeMap) {
+            if (this._chartPanel.widget() instanceof VizTypeMap[key]) {
+                this._chartType = key as VizType;
+                break;
+            }
+        }
+    }
+    return retVal;
+};

package/src/ddl2/pipelinePanel.ts

@@ -1,20 +1,20 @@
 import { JSONEditor } from "@hpcc-js/codemirror";
-import { Button, PropertyExt, publish, publishProxy, SelectionBar, SelectionButton, Spacer } from "@hpcc-js/common";
+import { Button, PropertyExt, SelectionBar, SelectionButton, Spacer } from "@hpcc-js/common";
 import { DatasourceTable } from "@hpcc-js/dgrid";
 import { ChartPanel } from "@hpcc-js/layout";
 import { PropertyEditor } from "@hpcc-js/other";
 import { SplitPanel, TabPanel } from "@hpcc-js/phosphor";
-import { Activity } from "./activities/activity";
-import { DatasourceAdapt } from "./activities/databomb";
-import { Datasource } from "./activities/datasource";
-import { DSPicker } from "./activities/dspicker";
-import { Filters } from "./activities/filter";
-import { GroupBy } from "./activities/groupby";
-import { Limit } from "./activities/limit";
-import { Mappings, Project } from "./activities/project";
-import { Sort } from "./activities/sort";
-import { Element as ModelElement, IElementError, State } from "./model/element";
-import { Visualization } from "./model/visualization";
+import { Activity } from "./activities/activity.ts";
+import { DatasourceAdapt } from "./activities/databomb.ts";
+import { Datasource } from "./activities/datasource.ts";
+import { DSPicker } from "./activities/dspicker.ts";
+import { Filters } from "./activities/filter.ts";
+import { GroupBy } from "./activities/groupby.ts";
+import { Limit } from "./activities/limit.ts";
+import { Mappings, Project } from "./activities/project.ts";
+import { Sort } from "./activities/sort.ts";
+import { Element as ModelElement, IElementError, State } from "./model/element.ts";
+import { Visualization } from "./model/visualization.ts";
 
 import "../../src/ddl2/pipelinePanel.css";
 
@@ -96,9 +96,6 @@ class PipelinePanel extends ChartPanel {
             this.title(sb.label()).render();
         });
 
-    @publish([], "array", "Disabled pipeline items")
-    disableActivities: publish<this, string[]>;
-
     constructor(owner: PipelineSplitPanel) {
         super();
         this._owner = owner;
@@ -329,6 +326,11 @@ class PipelinePanel extends ChartPanel {
 }
 PipelinePanel.prototype._class += " marshaller_PipelinePanel";
 
+interface PipelinePanel {
+    disableActivities(): string[];
+    disableActivities(_: string[]): this;
+}
+
 class DDLPreview extends ChartPanel {
 
     private _save = new Button().faChar("fa-save").tooltip("Save")
@@ -406,9 +408,6 @@ export class PipelineSplitPanel extends SplitPanel {
     private _rhsDDLPreview = new DDLPreview();
     private _rhsDataPreview = new DatasourceTable().pagination(true);
 
-    @publishProxy("_rhsPropsPanel")
-    disableActivities: publish<this, string[]>;
-
     constructor() {
         super();
         this._previewPanel
@@ -463,3 +462,12 @@ export class PipelineSplitPanel extends SplitPanel {
     propChanged(id: string, newValue: any, oldValue: any, source: PropertyExt) {
     }
 }
+
+export interface PipelineSplitPanel {
+    disableActivities(): string[];
+    disableActivities(_: string[]): this;
+}
+
+PipelinePanel.prototype.publish("disableActivities", [], "array", "Disabled pipeline items");
+
+PipelineSplitPanel.prototype.publishProxy("disableActivities", "_rhsPropsPanel");

package/src/index.ts

@@ -1,26 +1,26 @@
-export * from "./__package__";
+export * from "./__package__.ts";
 export { hookSend } from "@hpcc-js/comms";
-export * from "./ddl2/activities/activity";
-export * from "./ddl2/activities/databomb";
-export * from "./ddl2/activities/datasource";
-export * from "./ddl2/activities/dspicker";
-export * from "./ddl2/activities/filter";
-export * from "./ddl2/activities/form";
-export * from "./ddl2/activities/groupby";
-export * from "./ddl2/activities/hipiepipeline";
-export * from "./ddl2/activities/limit";
-export * from "./ddl2/activities/logicalfile";
-export * from "./ddl2/activities/nullview";
-export * from "./ddl2/activities/project";
-export * from "./ddl2/activities/roxie";
-export * from "./ddl2/activities/sort";
-export * from "./ddl2/activities/wuresult";
-export * from "./ddl2/model/element";
-export * from "./ddl2/model/visualization";
-export * from "./ddl2/model/vizChartPanel";
-export * from "./ddl2/dashboard";
-export * from "./ddl2/ddl";
-export * from "./ddl2/ddleditor";
-export * from "./ddl2/graphadapter";
-export * from "./ddl2/javascriptadapter";
-export * from "./dashy";
+export * from "./ddl2/activities/activity.ts";
+export * from "./ddl2/activities/databomb.ts";
+export * from "./ddl2/activities/datasource.ts";
+export * from "./ddl2/activities/dspicker.ts";
+export * from "./ddl2/activities/filter.ts";
+export * from "./ddl2/activities/form.ts";
+export * from "./ddl2/activities/groupby.ts";
+export * from "./ddl2/activities/hipiepipeline.ts";
+export * from "./ddl2/activities/limit.ts";
+export * from "./ddl2/activities/logicalfile.ts";
+export * from "./ddl2/activities/nullview.ts";
+export * from "./ddl2/activities/project.ts";
+export * from "./ddl2/activities/roxie.ts";
+export * from "./ddl2/activities/sort.ts";
+export * from "./ddl2/activities/wuresult.ts";
+export * from "./ddl2/model/element.ts";
+export * from "./ddl2/model/visualization.ts";
+export * from "./ddl2/model/vizChartPanel.ts";
+export * from "./ddl2/dashboard.ts";
+export * from "./ddl2/ddl.ts";
+export * from "./ddl2/ddleditor.ts";
+export * from "./ddl2/graphadapter.ts";
+export * from "./ddl2/javascriptadapter.ts";
+export * from "./dashy.ts";

package/types/__package__.d.ts

@@ -1,4 +1,3 @@
-export declare const PKG_NAME = "@hpcc-js/marshaller";
-export declare const PKG_VERSION = "2.28.11";
-export declare const BUILD_VERSION = "2.108.11";
-//# sourceMappingURL=__package__.d.ts.map
+export declare const PKG_NAME = "__PACKAGE_NAME__";
+export declare const PKG_VERSION = "__PACKAGE_VERSION__";
+export declare const BUILD_VERSION = "__BUILD_VERSION__";

package/types/dashy.d.ts

@@ -1,10 +1,10 @@
-import { publish, Widget } from "@hpcc-js/common";
+import { Widget } from "@hpcc-js/common";
 import { DDL1, DDL2 } from "@hpcc-js/ddl-shim";
 import { SplitPanel } from "@hpcc-js/phosphor";
-import { Activity } from "./ddl2/activities/activity";
-import { Element, ElementContainer, State } from "./ddl2/model/element";
-import { Visualization } from "./ddl2/model/visualization";
-import { VizChartPanel } from "./ddl2/model/vizChartPanel";
+import { Activity } from "./ddl2/activities/activity.ts";
+import { Element, ElementContainer, State } from "./ddl2/model/element.ts";
+import { Visualization } from "./ddl2/model/visualization.ts";
+import { VizChartPanel } from "./ddl2/model/vizChartPanel.ts";
 import "../src/dashy.css";
 export type FocusType = Element | Activity | Visualization | VizChartPanel | State | undefined;
 export declare class Dashy extends SplitPanel {
@@ -24,7 +24,6 @@ export declare class Dashy extends SplitPanel {
     private _lhsDebugDDLv1;
     private _lhsDebugDDLv2;
     private _rhsSplitView;
-    disableActivities: publish<this, string[]>;
     private _fileOpen;
     static create(target: string, ddl?: DDL1.DDLSchema | DDL2.Schema, baseUrl?: string, wuid?: string): Promise<Dashy>;
     constructor();
@@ -51,4 +50,7 @@ export declare class Dashy extends SplitPanel {
     enter(domNode: any, element: any): void;
     update(domNode: any, element: any): void;
 }
-//# sourceMappingURL=dashy.d.ts.map
+export interface Dashy {
+    disableActivities(): string[];
+    disableActivities(_: string[]): this;
+}

package/types/ddl2/PopupManager.d.ts

@@ -1,6 +1,6 @@
 import { IMonitorHandle, Widget } from "@hpcc-js/common";
-import { ElementContainer } from "./model/element";
-import { IVizPopupPanelOwner, VizChartPanel, VizPopupPanel } from "./model/vizChartPanel";
+import { ElementContainer } from "./model/element.ts";
+import { IVizPopupPanelOwner, VizChartPanel, VizPopupPanel } from "./model/vizChartPanel.ts";
 export declare class PopupManager extends Widget implements IVizPopupPanelOwner {
     protected _ec: ElementContainer;
     protected _popups: VizPopupPanel[];
@@ -17,4 +17,3 @@ export declare class PopupManager extends Widget implements IVizPopupPanelOwner
     syncPopups(): this;
     vizActivation(): void;
 }
-//# sourceMappingURL=PopupManager.d.ts.map

package/types/ddl2/activities/activity.d.ts

@@ -103,4 +103,3 @@ export declare class ActivitySelection extends ActivityArray {
     exec(): Promise<void>;
     outData(): ReadonlyArray<object>;
 }
-//# sourceMappingURL=activity.d.ts.map

package/types/ddl2/activities/databomb.d.ts

@@ -1,8 +1,8 @@
 import { DDL2 } from "@hpcc-js/ddl-shim";
 import { IDatasource } from "@hpcc-js/dgrid";
-import { Activity } from "./activity";
-import { Datasource } from "./datasource";
-import { FormField } from "./form";
+import { Activity } from "./activity.ts";
+import { Datasource } from "./datasource.ts";
+import { FormField } from "./form.ts";
 export declare function rowToFields(row: object, _jsonData: any): DDL2.IField[];
 export declare class Databomb extends Datasource {
     private _jsonData;
@@ -43,4 +43,3 @@ export declare class DatasourceAdapt implements IDatasource {
     total(): number;
     fetch(from: number, count: number): Promise<ReadonlyArray<object>>;
 }
-//# sourceMappingURL=databomb.d.ts.map

package/types/ddl2/activities/datasource.d.ts

@@ -1,24 +1,26 @@
 import { DDL2 } from "@hpcc-js/ddl-shim";
-import { Activity } from "./activity";
-import { Databomb } from "./databomb";
-import { Form } from "./form";
-import { LogicalFile } from "./logicalfile";
-import { RestResult, RestService } from "./rest";
-import { RoxieResult, RoxieService } from "./roxie";
-import { WU, WUResult } from "./wuresult";
+import { Activity } from "./activity.ts";
+import { Databomb } from "./databomb.ts";
+import { Form } from "./form.ts";
+import { LogicalFile } from "./logicalfile.ts";
+import { RestResult, RestService } from "./rest.ts";
+import { RoxieResult, RoxieService } from "./roxie.ts";
+import { WU, WUResult } from "./wuresult.ts";
 export declare class Datasource extends Activity {
     constructor();
 }
 export type DatasourceRefType = Databomb | Form | LogicalFile | RoxieResult | WUResult | RestResult;
 export type DatasourceType = Databomb | Form | LogicalFile | RoxieService | WU | RestService;
 export declare class DatasourceRef extends Activity {
+    _origDatasource: any;
     _datasource: DatasourceRefType;
-    datasource(): DatasourceRefType;
-    datasource(_: DatasourceRefType): this;
     constructor();
     hash(more?: {
         [key: string]: any;
     }): string;
     toDDL(): DDL2.IDatabombRef;
 }
-//# sourceMappingURL=datasource.d.ts.map
+export interface DatasourceRef {
+    datasource(): DatasourceRefType;
+    datasource(_: DatasourceRefType): this;
+}

package/types/ddl2/activities/dspicker.d.ts

@@ -1,16 +1,14 @@
 import { DDL2 } from "@hpcc-js/ddl-shim";
-import { ElementContainer } from "../model/element";
-import { ActivitySelection, IActivityError } from "./activity";
-import { DatasourceRef, DatasourceRefType } from "./datasource";
+import { ElementContainer } from "../model/element.ts";
+import { ActivitySelection, IActivityError } from "./activity.ts";
+import { DatasourceRef, DatasourceRefType } from "./datasource.ts";
 export declare class DSPicker extends ActivitySelection {
     private _ec;
     private _nullDatasource;
+    _origDatasourceID: any;
+    _origDatasourceRef: any;
     _datasourceID: string;
-    datasourceID(): string;
-    datasourceID(_: string): this;
     _datasourceRef: DatasourceRef;
-    datasourceRef(): DatasourceRef;
-    datasourceRef(_: DatasourceRef): this;
     datasource(): DatasourceRefType;
     refreshRef(id: string): void;
     selection(): DatasourceRef;
@@ -26,4 +24,9 @@ export declare class DSPicker extends ActivitySelection {
         text: string;
     }[];
 }
-//# sourceMappingURL=dspicker.d.ts.map
+export interface DSPicker {
+    datasourceID(): string;
+    datasourceID(_: string): this;
+    datasourceRef(): DatasourceRef;
+    datasourceRef(_: DatasourceRef): this;
+}

package/types/ddl2/activities/filter.d.ts

@@ -1,17 +1,9 @@
-import { PropertyExt, publish } from "@hpcc-js/common";
+import { PropertyExt } from "@hpcc-js/common";
 import { DDL2 } from "@hpcc-js/ddl-shim";
-import { Element, ElementContainer } from "../model/element";
-import { Activity, IActivityError, ReferencedFields } from "./activity";
+import { Element, ElementContainer } from "../model/element.ts";
+import { Activity, IActivityError, ReferencedFields } from "./activity.ts";
 export declare class ColumnMapping extends PropertyExt {
     private _owner;
-    remoteField: publish<this, string>;
-    remoteField_exists: () => boolean;
-    remoteField_valid: () => boolean;
-    localField: publish<this, string>;
-    localField_exists: () => boolean;
-    localField_valid: () => boolean;
-    condition: publish<this, DDL2.IMappingConditionType>;
-    nullable: publish<this, boolean>;
     validate(prefix: string): IActivityError[];
     constructor();
     owner(): RemoteFilter;
@@ -27,12 +19,22 @@ export declare class ColumnMapping extends PropertyExt {
     createFilterDescription(filterSelection: any[]): string;
     createFilter(filterSelection: any[]): (localRow: any) => boolean;
 }
+export interface ColumnMapping {
+    remoteField(): string;
+    remoteField(_: string): this;
+    remoteField_exists(): boolean;
+    remoteField_valid(): boolean;
+    localField(): string;
+    localField(_: string): this;
+    localField_exists(): boolean;
+    localField_valid(): boolean;
+    condition(): DDL2.IMappingConditionType;
+    condition(_: DDL2.IMappingConditionType): this;
+    nullable(): boolean;
+    nullable(_: boolean): this;
+}
 export declare class RemoteFilter extends PropertyExt {
     private _owner;
-    source: publish<this, string>;
-    source_exists: () => boolean;
-    source_valid: () => boolean;
-    mappings: publish<this, ColumnMapping[]>;
     validate(prefix: string): IActivityError[];
     constructor();
     owner(): Filters;
@@ -58,16 +60,16 @@ export declare class RemoteFilter extends PropertyExt {
     createFilter(): (localRow: any) => boolean;
     createFilterDescription(): string;
 }
+export interface RemoteFilter {
+    source(): string;
+    source(_: string): this;
+    source_exists(): boolean;
+    source_valid(): boolean;
+    mappings(): ColumnMapping[];
+    mappings(_: ColumnMapping[]): this;
+}
 export declare class StaticFilter extends PropertyExt {
     private _owner;
-    localField: publish<this, string>;
-    localField_exists: () => boolean;
-    localField_valid: () => boolean;
-    condition: publish<this, DDL2.IMappingConditionType>;
-    value: publish<this, string | number | boolean>;
-    value_exists: () => boolean;
-    value_valid: () => boolean;
-    valueType: publish<this, "number" | "string">;
     validate(prefix: string): IActivityError[];
     constructor();
     owner(): Filters;
@@ -83,13 +85,25 @@ export declare class StaticFilter extends PropertyExt {
     createFilterDescription(): string;
     createFilter(): (localRow: any) => boolean;
 }
+export interface StaticFilter {
+    localField(): string;
+    localField(_: string): this;
+    localField_exists(): boolean;
+    localField_valid(): boolean;
+    condition(): DDL2.IMappingConditionType;
+    condition(_: DDL2.IMappingConditionType): this;
+    value(): string | number | boolean;
+    value(_: string | number | boolean): this;
+    value_exists(): boolean;
+    value_valid(): boolean;
+    valueType(): "number" | "string";
+    valueType(_: "number" | "string"): this;
+}
 type FilterT = RemoteFilter | StaticFilter;
 export declare class Filters extends Activity {
     private _ec;
     static Filter: typeof RemoteFilter;
     static Mapping: typeof ColumnMapping;
-    remoteFilter: publish<this, RemoteFilter[]>;
-    staticFilter: publish<this, StaticFilter[]>;
     validate(): IActivityError[];
     constructor(_ec: ElementContainer);
     toDDL(): DDL2.IFilter;
@@ -109,5 +123,10 @@ export declare class Filters extends Activity {
     validStaticFilters(): StaticFilter[];
     validFilters(): FilterT[];
 }
+export interface Filters {
+    remoteFilter(): RemoteFilter[];
+    remoteFilter(_: RemoteFilter[]): this;
+    staticFilter(): StaticFilter[];
+    staticFilter(_: StaticFilter[]): this;
+}
 export {};
-//# sourceMappingURL=filter.d.ts.map

package/types/ddl2/activities/form.d.ts

@@ -1,15 +1,9 @@
-import { PropertyExt, publish } from "@hpcc-js/common";
+import { PropertyExt } from "@hpcc-js/common";
 import { DDL2 } from "@hpcc-js/ddl-shim";
-import { Datasource } from "./datasource";
+import { Datasource } from "./datasource.ts";
 type IField = DDL2.IFieldBoolean | DDL2.IFieldNumber | DDL2.IFieldString | DDL2.IFieldDataset;
 export declare class FormField extends PropertyExt {
     protected _owner: Form;
-    fieldID: publish<this, string>;
-    type: publish<this, "boolean" | "number" | "string" | "dataset">;
-    default: publish<this, boolean | number | string | any[]>;
-    value: publish<this, boolean | number | string>;
-    value_exists: () => boolean;
-    childFields: publish<this, FormField[]>;
     disableChildField(): boolean;
     constructor();
     toDDL(): IField;
@@ -22,7 +16,6 @@ export declare class FormField extends PropertyExt {
     calcValue(): string | number | boolean | any[];
 }
 export declare class Form extends Datasource {
-    formFields: publish<this, FormField[]>;
     constructor();
     toDDL(): DDL2.IForm;
     fromDDL(ddl: DDL2.IForm, skipID?: boolean): this;
@@ -36,5 +29,21 @@ export declare class Form extends Datasource {
     computeData(): ReadonlyArray<object>;
     total(): number;
 }
+export interface FormField {
+    type(): "boolean" | "number" | "string" | "dataset";
+    type(_: "boolean" | "number" | "string" | "dataset"): this;
+    fieldID(): string;
+    fieldID(_: string): this;
+    default(): boolean | number | string | any[];
+    default(_: boolean | number | string | any[]): this;
+    value(): boolean | number | string;
+    value(_: boolean | number | string): this;
+    value_exists(): boolean;
+    childFields(): FormField[];
+    childFields(_: FormField[]): this;
+}
+export interface Form {
+    formFields(): FormField[];
+    formFields(_: FormField[]): this;
+}
 export {};
-//# sourceMappingURL=form.d.ts.map