jpf 5.0.12 → 5.0.13

package/src/controls/svg/Pattern/Pattern.ts

@@ -1,8 +1,7 @@
 import { Element } from "../../../framework/element";
 import { IProperties, extendProperties } from "../../../framework/properties";
-import { ISubscribable } from "../../../framework/observable";
 import { PatternUnits } from "../../../framework/types";
-
+import { ISubscribable } from "../../../framework/observableInterfaces";
 import { CircleElement } from "../Circle/Circle";
 import { EllipseElement } from "../Ellipse/Ellipse";
 import { LineElement } from "../Line/Line";

package/src/controls/svg/Polygon/Polygon.ts

@@ -1,6 +1,7 @@
 import { Element } from "../../../framework/element";
 import { IProperties, extendProperties } from "../../../framework/properties";
-import { ISubscribable, unwrap } from "../../../framework/observable";
+import { ISubscribable} from "../../../framework/observableInterfaces";
+import { unwrap } from "../../../framework/observablelmplementations";
 import { ISvgPoint as SvgPoint, serializePoints as getPoints } from "../svg";
 
 export interface IPolygonProperties extends IProperties {

package/src/controls/svg/Polyline/Polyline.ts

@@ -1,7 +1,7 @@
 import { Element } from "../../../framework/element";
 import { IProperties , extendProperties } from "../../../framework/properties";
-import { ISubscribable } from "../../../framework/observable";
 import { ISvgPoint as SvgPoint, serializePoints } from "../svg";
+import { ISubscribable } from "../../../framework/observableInterfaces";
 
 export interface IPolylineProperties extends IProperties {
     points: Array<SvgPoint> | ISubscribable<Array<SvgPoint>>;

package/src/controls/svg/Rectangle/Rectangle.ts

@@ -1,6 +1,6 @@
 import { Element } from "../../../framework/element";
 import { IProperties, extendProperties  } from "../../../framework/properties";
-import { ISubscribable } from "../../../framework/observable";
+import { ISubscribable } from "../../../framework/observableInterfaces";
 
 export interface IRectangleProperties extends IProperties {
     x?: number | string | ISubscribable<number | string>;

package/src/controls/svg/Svg/Svg.ts

@@ -1,7 +1,7 @@
 import { Element, IElement } from "../../../framework/element";
 import { IProperties, extendProperties } from "../../../framework/properties";
-import { ISubscribable } from "../../../framework/observable";
 import { PreserveAspectRatio } from "../../../framework/types";
+import { ISubscribable } from "../../../framework/observableInterfaces";
 
 export interface ISvgProperties extends IProperties {
     x?: number | string | ISubscribable<number | string>;

package/src/controls/svg/Text/Text.ts

@@ -1,6 +1,6 @@
 import { Element } from "../../../framework/element";
 import { IProperties, extendProperties  } from "../../../framework/properties";
-import { ISubscribable } from "../../../framework/observable";
+import { ISubscribable } from "../../../framework/observableInterfaces";
 
 export interface ITextProperties extends IProperties {
     x?: number | string | ISubscribable<number | string>;

package/src/controls/svg/Title/Title.ts

@@ -1,8 +1,8 @@
 import { Element } from "../../../framework/element";
 import { IProperties, extendProperties } from "../../../framework/properties";
-import { ISubscribable } from "../../../framework/observable";
+import { ISubscribable } from "../../../framework/observableInterfaces";
 
-export interface ITitleProperties extends IProperties{
+export interface ITitleProperties extends IProperties {
     title: string | ISubscribable<string>
 }
 

package/src/controls/svg/svg.ts

@@ -1,4 +1,5 @@
-import { ISubscribable, isSubscribable, unwrap, computed } from "../../framework/observable";
+import { ISubscribable } from "../../framework/observableInterfaces";
+import { isSubscribable, unwrap, computed } from "../../framework/observablelmplementations";
 
 export interface ISvgPoint {
     x: number;

package/src/framework/attributes.ts

@@ -1,5 +1,5 @@
 import { PreserveAspectRatio } from "./types";
-import { ISubscribable } from "./observable";
+import { ISubscribable } from "./observableInterfaces";
 
 export interface IAttributes {
     alt?: string,

package/src/framework/element.ts

@@ -1,5 +1,6 @@
 import "tocca";
-import { unwrap, isSubscribable, IDisposer, ISubscribable } from "./observable";
+import { IDisposer, ISubscribable } from "./observableInterfaces";
+import { unwrap, isSubscribable } from "./observablelmplementations";
 import { IProperties, Properties, applyBindings } from "./properties";
 
 const htmlTags = {

package/src/framework/observableInterfaces.ts

@@ -0,0 +1,32 @@
+export interface IDisposer {
+    (): void;
+}
+
+export interface ISubscribable<TValue> {
+    subscribe(handler: (arg: TValue, prev: TValue) => void): IDisposer;
+}
+
+export interface IObservableValue<TValue = any, TSetter = TValue> extends ISubscribable<TValue> {
+    (): TValue;
+    setValue(value: TSetter | null): void;
+    setValueInAction(value: TSetter | null): void;
+    setInternal(value: TValue | null): void;
+}
+
+export interface IObservableArray<TItem = any, TSetter = Array<TItem>> extends Array<TItem>, ISubscribable<Array<TItem>> {
+    get(): Array<TItem>;
+    setItems(items: TSetter | null, triggerSetter?: boolean): void;
+    setInternal(items: Array<TItem> | null): void;
+}
+
+export interface IComputed<TValue> extends ISubscribable<TValue> {
+    (): TValue;
+}
+
+export interface IObservableMap<TKey, TValue> {
+
+}
+
+export interface IObservableSet<TItem> {
+
+}

package/src/framework/{observable.ts → observablelmplementations.ts}

@@ -1,35 +1,4 @@
-export interface IDisposer {
-    (): void;
-}
-
-export interface ISubscribable<TValue> {
-    subscribe(handler: (arg: TValue, prev: TValue) => void): IDisposer;
-}
-
-export interface IObservableValue<TValue = any, TSetter = TValue> extends ISubscribable<TValue> {
-    (): TValue;
-    setValue(value: TSetter | null): void;
-    setValueInAction(value: TSetter | null): void;
-    setInternal(value: TValue | null): void;
-}
-
-export interface IObservableArray<TItem = any, TSetter = Array<TItem>> extends Array<TItem>, ISubscribable<Array<TItem>> {
-    get(): Array<TItem>;
-    setItems(items: TSetter | null, triggerSetter?: boolean): void;
-    setInternal(items: Array<TItem> | null): void;
-}
-
-export interface IComputed<TValue> extends ISubscribable<TValue> {
-    (): TValue;
-}
-
-export interface IObservableMap<TKey, TValue> {
-
-}
-
-export interface IObservableSet<TItem> {
-
-}
+import { ISubscribable, IComputed, IObservableValue, IObservableArray, IObservableMap, IObservableSet } from "./observableInterfaces";
 
 export const implementations = {
     unwrap: <TValue>(value: TValue | ISubscribable<TValue>): TValue => {

package/src/framework/properties.ts

@@ -1,9 +1,9 @@
 import { IEventListeners, IUiElementEventMap, IEventListenerOptions, IGenericEventListener, mouseEvents, touchEvents, isGlobalEvent } from "./event";
 import { IAttributes, IAttributesSubscribable } from "./attributes";
 import { IStyle as Style, IStyleSubscribable as StyleSubscribable } from "./style";
-import { unwrap, executeHandlerOnObject, isSubscribable } from "./observable";
-import { IDisposer, ISubscribable } from "./observable";
 import { userAgent } from "../utilities/userAgent/userAgent";
+import { ISubscribable, IDisposer } from "./observableInterfaces";
+import { isSubscribable, unwrap, executeHandlerOnObject } from "./observablelmplementations";
 
 export interface IWebSocketMessageHandler {
     handleWebSocketMessage: (message: any) => void;

package/src/framework/style.ts

@@ -1,5 +1,5 @@
 import * as types from "./types";
-import { ISubscribable } from "./observable";
+import { ISubscribable } from "./observableInterfaces";
 
 export interface IStyle {
     /**

package/src/index.ts

@@ -1,9 +1,11 @@
 import * as controls from "./controls/index";
 import * as utilities from "./utilities/index";
+
 import * as attributes from "./framework/attributes";
 import * as element from "./framework/element";
 import * as event from "./framework/event";
-import * as observable from "./framework/observable"
+import * as observableInterfaces from "./framework/observableInterfaces";
+import * as observableImplementations from "./framework/observablelmplementations";
 import * as properties from "./framework/properties";
 import * as root from "./framework/root";
 import * as style from "./framework/style";
@@ -11,11 +13,13 @@ import * as types from "./framework/types";
 
 export { controls };
 export { utilities };
+
 export { attributes };
 export { element };
+export { observableInterfaces };
+export { observableImplementations };
 export { event };
 export { properties };
 export { root };
 export { style };
 export { types };
-export { observable };

package/dist/framework/observable.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"observable.js","sourceRoot":"","sources":["../../src/framework/observable.ts"],"names":[],"mappings":"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"}