@buerli.io/core 0.0.34-beta.0 → 0.0.35-beta.1

package/build/{store → esm/store}/states/selection.js

@@ -1,3 +1,4 @@
+import { subscribeItems, unsubscribeItems } from '../subscribtion/selection';
 ////////////////////////////////////////////////////
 // CONSTANTS
 ////////////////////////////////////////////////////
@@ -8,8 +9,11 @@ export const selectionData = () => ({
 });
 export const selectionApi = (set, get) => ({
     unselectAll() {
+        const drawingId = get().id;
         const activeSelector = get().selection.active;
         if (activeSelector) {
+            const unselItems = get().selection.refs[activeSelector].items;
+            unsubscribeItems(drawingId, activeSelector, unselItems);
             set(state => {
                 const selector = state.selection.refs[activeSelector];
                 return {
@@ -19,12 +23,13 @@ export const selectionApi = (set, get) => ({
         }
     },
     unselect(...unselItems) {
-        const { selection } = get();
+        const { selection, id: drawingId } = get();
         const activeSelectorId = selection.active;
         if (activeSelectorId) {
             // Remove unselItems from selector's items
             const selector = selection.refs[activeSelectorId];
             const newItems = selector.items.filter(item => unselItems.find(uItem => uItem.id === item.id) === undefined);
+            unsubscribeItems(drawingId, activeSelectorId, unselItems);
             if (selector.customUnSelect) {
                 // Find recently unselected items
                 const diff = selector.items.filter(item1 => {
@@ -43,7 +48,7 @@ export const selectionApi = (set, get) => ({
         }
     },
     select(...newItems) {
-        const { selection, api } = get();
+        const { selection, api, id: drawingId } = get();
         const activeSelectorId = selection.active;
         const { isItemSelected } = api.selection;
         if (activeSelectorId) {
@@ -53,20 +58,25 @@ export const selectionApi = (set, get) => ({
             let filteredItems = newItems.filter((item1, idx) => newItems.findIndex(item2 => item2.id === item1.id) === idx);
             // Remove already selected items and duplicates
             filteredItems = filteredItems.filter(item => !isItemSelected(item, activeSelectorId));
+            let unsubItems = [];
             let result = [...curItems, ...filteredItems];
             if (selector.maxLen > 0) {
                 if (filteredItems.length === selector.maxLen) {
                     result = [...filteredItems];
+                    unsubItems = [...curItems];
                 }
                 else if (filteredItems.length > selector.maxLen) {
                     const extraItems = filteredItems.length - selector.maxLen;
                     // If filteredItems has bigger length then selector.maxLen, remove last few items from filteredItems.
                     result = filteredItems.slice(0, -extraItems);
+                    unsubItems = [...curItems];
                 }
                 else if (filteredItems.length + curItems.length >= selector.maxLen) {
                     const extraItems = filteredItems.length + curItems.length - selector.maxLen;
+                    const allItems = [...curItems, ...filteredItems];
                     // If filteredItems.len + curItems.len > selector.maxLen, remove first few items from union of curItems and filteredItems.
-                    result = [...curItems, ...filteredItems].slice(extraItems);
+                    result = allItems.slice(extraItems);
+                    unsubItems = allItems.slice(0, extraItems);
                 }
             }
             if (selector.customSelect !== undefined) {
@@ -77,6 +87,10 @@ export const selectionApi = (set, get) => ({
                 selector.customSelect(activeSelectorId, result, diff);
             }
             else {
+                // subscribe items which will be selected
+                subscribeItems(drawingId, activeSelectorId, result);
+                // unsubscribe items which will be unselected
+                unsubscribeItems(drawingId, activeSelectorId, unsubItems);
                 set(state => {
                     return {
                         selection: Object.assign(Object.assign({}, state.selection), { refs: Object.assign(Object.assign({}, state.selection.refs), { [activeSelectorId]: Object.assign(Object.assign({}, selector), { items: result }) }) }),
@@ -121,15 +135,19 @@ export const selectionApi = (set, get) => ({
                         customUnSelect,
                     } }) }),
         }));
-        return () => get &&
-            get() &&
-            set(state => {
-                const refs = state.selection.refs;
-                delete refs[selectorId];
-                return {
-                    selection: Object.assign(Object.assign({}, state.selection), { active: state.selection.active === selectorId ? null : state.selection.active, refs }),
-                };
-            });
+        return () => {
+            if (get && get()) {
+                const drawingId = get().id;
+                unsubscribeItems(drawingId, selectorId);
+                set(state => {
+                    const refs = state.selection.refs;
+                    delete refs[selectorId];
+                    return {
+                        selection: Object.assign(Object.assign({}, state.selection), { active: state.selection.active === selectorId ? null : state.selection.active, refs }),
+                    };
+                });
+            }
+        };
     },
     areItemsSelected: (items, selectorId) => {
         const { selection } = get();
@@ -155,6 +173,11 @@ export const selectionApi = (set, get) => ({
         return Boolean(selector.items.find(i => areItemsEqual(i, item)));
     },
     setItems(id, items) {
+        var _a;
+        const { selection, id: drawingId } = get();
+        const curItems = ((_a = selection.refs[id]) === null || _a === void 0 ? void 0 : _a.items) || [];
+        unsubscribeItems(drawingId, id, curItems);
+        subscribeItems(drawingId, id, items);
         set(state => {
             const selector = state.selection.refs[id];
             return {

package/build/esm/store/subscribtion/selection.js

@@ -0,0 +1,42 @@
+// This is the solution for cases when object was deleted from tree and we need to remove corresponding selectedItem.
+import { getDrawing } from '../..';
+import { subscribeToDrawing } from './subscribeToDrawing';
+// This object contains unsubscibe function for all existing selections in all drawings
+export const unsubs = {};
+function getId(selectorId, itemId) {
+    return `${selectorId}_${itemId}`;
+}
+export function subscribeItems(drawingId, selectorId, items) {
+    const items_ = items || getDrawing(drawingId).selection.refs[selectorId].items;
+    items_.forEach(item => {
+        subscribeItem(drawingId, selectorId, item);
+    });
+}
+function subscribeItem(drawingId, selectorId, item) {
+    if (item.removeCondition && !unsubs[getId(selectorId, item.id)]) {
+        const selApi = getDrawing(drawingId).api.selection;
+        unsubs[getId(selectorId, item.id)] = subscribeToDrawing(drawingId, (d) => item.removeCondition && item.removeCondition(d), (removeCond) => {
+            var _a;
+            // Unselect item whose removeCondition got true
+            if (removeCond) {
+                const newItems = ((_a = getDrawing(drawingId).selection.refs[selectorId]) === null || _a === void 0 ? void 0 : _a.items) || [];
+                selApi.setItems(selectorId, newItems.filter(item_ => item_.id !== item.id));
+            }
+        });
+    }
+}
+export function unsubscribeItems(drawingId, selectorId, items) {
+    const items_ = items || getDrawing(drawingId).selection.refs[selectorId].items;
+    items_.forEach(item => {
+        unsubscribeItem(selectorId, item);
+    });
+}
+function unsubscribeItem(selectorId, item) {
+    if (item.removeCondition) {
+        const id = getId(selectorId, item.id);
+        if (unsubs[id]) {
+            unsubs[id]();
+            delete unsubs[id];
+        }
+    }
+}

package/build/esm/store/subscribtion/subscribeToDrawing.js

@@ -0,0 +1,5 @@
+import { api } from '../store';
+export function subscribeToDrawing(drawingId, sel, callback) {
+    const unsub = api.subscribe(callback, state => state.drawing.refs[drawingId] && sel(state.drawing.refs[drawingId]));
+    return unsub;
+}

package/build/{utils → esm/utils}/Timing.js

@@ -5,12 +5,16 @@ const start = (key = uuidv4()) => {
     return key;
 };
 const measure = (key, mode = 'fromStart') => {
+    if (!cache[key])
+        return Number.NaN;
     const curr = performance.now();
     const prev = mode === 'fromPrevious' ? cache[key].previousTime : cache[key].startTime;
     cache[key] = Object.assign(Object.assign({}, cache[key]), { previousTime: curr });
     return curr - prev;
 };
 const stop = (key) => {
+    if (!cache[key])
+        return Number.NaN;
     const curr = performance.now();
     const prev = cache[key].startTime;
     delete cache[key];

package/build/types/index.d.ts

@@ -1,4 +1,36 @@
-export * from './ErrorTypes';
-export * from './IGraphicPackage';
-export * from './IStructurePatch';
-export * from './IStructureTree';
+export * from './store';
+export * from './geometry';
+export * from './types';
+export * from './utils/Math';
+export * from './utils/Measure';
+export * from './utils/Timing';
+export * from './store/subscribtion/subscribeToDrawing';
+/**
+ * Because babel typescript tools can not handle the type definitions
+ * in an other way, they have to be re-exported as you can see in this code region.
+ *
+ * Please have a look at https://github.com/awv-informatik/buerli/pull/129 for more information.
+ */
+import { BuerliState as BS } from './store/states/buerli';
+export declare type BuerliState = BS;
+import { DrawingAPI as DrawingAPI1, DrawingID as DrawingID1, DrawingState as DrawingState1 } from './store/states/drawing';
+export declare type DrawingID = DrawingID1;
+export declare type DrawingState = DrawingState1;
+export declare type DrawingAPI = DrawingAPI1;
+import { GeometryConfig as GeometryConfig1, GeometryBounds as GeometryBounds1 } from './store/states/geometry';
+export declare type GeometryConfig = GeometryConfig1;
+export declare type GeometryBounds = GeometryBounds1;
+import { Plugin as Plugin1, PluginDescription as PluginDescription1, PluginID as PluginID1, PluginState as PluginState1 } from './store/states/plugin';
+export declare type Plugin = Plugin1;
+export declare type PluginDescription<InternalState = any> = PluginDescription1<InternalState>;
+export declare type PluginID = PluginID1;
+export declare type PluginState<InternalState = any> = PluginState1<InternalState>;
+import { SeletedItemData, SelectedItem as SelectedItem1, SelectionFilter as SelectionFilter1, SelectionScope as SelectionScope1, Selector as Selector1, SelectorID as SelectorID1, CustomSelect as CustomSelect1 } from './store/states/selection';
+export declare type SelectedItem<T extends SeletedItemData<any> = any> = SelectedItem1<T>;
+export declare type SelectionFilter = SelectionFilter1;
+export declare type SelectionScope = SelectionScope1;
+export declare type Selector<T extends SeletedItemData<any> = any> = Selector1<T>;
+export declare type SelectorID = SelectorID1;
+export declare type CustomSelect = CustomSelect1;
+import { Message as Message1 } from './store/states/message';
+export declare type Message = Message1;

package/build/{store → types/store}/index.d.ts

@@ -3,6 +3,9 @@ import { DrawingID, DrawingState } from './states/drawing';
 import { Message, MessageID } from './states/message';
 import { PluginID, PluginState } from './states/plugin';
 declare function getDrawing(id: DrawingID): DrawingState;
+/**
+ * @returns PluginState or undefined if either drawing or plugin don't exist
+ */
 declare function getPlugin(drawingId: DrawingID, pluginId: PluginID): PluginState;
 declare function init(sel?: Partial<BuerliOptions> | ((state: BuerliState) => Partial<BuerliOptions>)): void;
 declare function showMessage(message: Message): MessageID;

package/build/{store → types/store}/states/plugin.d.ts

@@ -43,7 +43,7 @@ export declare type PluginData = {
 export declare type PluginApi = ReturnType<typeof pluginApi>;
 export declare const pluginData: () => PluginData;
 export declare const pluginApi: (set: SetState<DrawingState>, get: GetState<DrawingState>) => {
-    setActiveFeature: (id: PluginID | null) => void;
+    setActiveFeature: (id: ObjectID | null) => void;
     setVisiblePlugin: (id: PluginID, visible: boolean) => void;
     setActiveGlobal: (id: PluginID, active: boolean) => void;
     createPlugin: (def: PluginDef, defaultId?: string | number | undefined, drawingId?: string | number | undefined, objectId?: number | undefined) => (deactivate?: boolean) => void;

package/build/{store → types/store}/states/selection.d.ts

@@ -12,6 +12,7 @@ export declare type SelectedItem<T extends SeletedItemData<any> = any> = {
     readonly scope: SelectionScope;
     readonly data: T;
     readonly label?: any;
+    readonly removeCondition?: (d: DrawingState) => boolean;
 };
 export declare type SelectionFilter = (scope: SelectionScope, data: any) => boolean;
 export declare type CustomSelect = (selectorId: SelectorID, newItems: SelectedItem[], diff: SelectedItem[]) => void;

package/build/types/store/subscribtion/selection.d.ts

@@ -0,0 +1,5 @@
+import { SelectorID, DrawingID } from '../..';
+import { SelectedItem } from '../states/selection';
+export declare const unsubs: Record<string, () => void>;
+export declare function subscribeItems(drawingId: DrawingID, selectorId: SelectorID, items?: SelectedItem[]): void;
+export declare function unsubscribeItems(drawingId: DrawingID, selectorId: SelectorID, items?: SelectedItem[]): void;

package/build/types/store/subscribtion/subscribeToDrawing.d.ts

@@ -0,0 +1,2 @@
+import { DrawingID, DrawingState } from '../states/drawing';
+export declare function subscribeToDrawing(drawingId: DrawingID, sel: (d: DrawingState) => any, callback: (arg: any) => void): () => void;

package/build/types/{IStructureTree.d.ts → types/IStructureTree.d.ts}

@@ -36,7 +36,6 @@ export interface IStructureObject {
     visible?: boolean;
     dimensions?: ObjectID[];
     expressionSet?: ObjectID;
-    features?: ObjectID[];
     geometrySet?: ObjectID;
     solids?: number[];
     instances?: ObjectID[];

package/build/types/types/index.d.ts

@@ -0,0 +1,4 @@
+export * from './ErrorTypes';
+export * from './IGraphicPackage';
+export * from './IStructurePatch';
+export * from './IStructureTree';

package/package.json

@@ -1,19 +1,22 @@
 {
   "name": "@buerli.io/core",
-  "version": "0.0.34-beta.0",
+  "version": "0.0.35-beta.1",
   "description": "buerli state management",
   "author": "AWV Informatik AG <info@awv-informatik.ch>",
   "repository": {},
-  "main": "build/index.js",
-  "module": "build/index.js",
-  "types": "build/index.d.ts",
+  "main": "build/cjs/index.js",
+  "module": "build/esm/index.js",
+  "types": "build/types/index.d.ts",
   "sideEffects": false,
   "scripts": {
     "ver": "npm version",
     "prepack": "npm run build:dist",
     "clean": "rimraf ./build && rimraf ./coverage",
-    "build": "echo Typescript: && tsc --version && tsc && echo DONE",
-    "build:dist": "npm run clean && echo Typescript: && tsc --version && tsc --sourceMap false && echo DONE",
+    "build": "npm run build:esm -- --sourceMap true --declaration true --declarationDir ./build/types",
+    "build:dist": "npm run clean && npm run build:esm && npm run build:cjs && npm run build:types && echo DONE",
+    "build:esm": "tsc --target es2017 --module esNext --declaration false --declarationDir null --sourceMap false --outDir ./build/esm",
+    "build:cjs": "tsc --target es2017 --module commonjs --declaration false --declarationDir null --sourceMap false --outDir ./build/cjs",
+    "build:types": "tsc --declaration --emitDeclarationOnly --outDir ./build/types",
     "lint": "eslint \"./src/**/*.ts?(x)\"",
     "test": "jest",
     "coverage": "npm run clean && npm run build && npm run jestLite -- --coverage",

package/build/index.d.ts

@@ -1,35 +0,0 @@
-export * from './store';
-export * from './geometry';
-export * from './types';
-export * from './utils/Math';
-export * from './utils/Measure';
-export * from './utils/Timing';
-/**
- * Because babel typescript tools can not handle the type definitions
- * in an other way, they have to be re-exported as you can see in this code region.
- *
- * Please have a look at https://github.com/awv-informatik/buerli/pull/129 for more information.
- */
-import { BuerliState as BS } from './store/states/buerli';
-export declare type BuerliState = BS;
-import { DrawingAPI as DrawingAPI1, DrawingID as DrawingID1, DrawingState as DrawingState1 } from './store/states/drawing';
-export declare type DrawingID = DrawingID1;
-export declare type DrawingState = DrawingState1;
-export declare type DrawingAPI = DrawingAPI1;
-import { GeometryConfig as GeometryConfig1, GeometryBounds as GeometryBounds1 } from './store/states/geometry';
-export declare type GeometryConfig = GeometryConfig1;
-export declare type GeometryBounds = GeometryBounds1;
-import { Plugin as Plugin1, PluginDescription as PluginDescription1, PluginID as PluginID1, PluginState as PluginState1 } from './store/states/plugin';
-export declare type Plugin = Plugin1;
-export declare type PluginDescription<InternalState = any> = PluginDescription1<InternalState>;
-export declare type PluginID = PluginID1;
-export declare type PluginState<InternalState = any> = PluginState1<InternalState>;
-import { SeletedItemData, SelectedItem as SelectedItem1, SelectionFilter as SelectionFilter1, SelectionScope as SelectionScope1, Selector as Selector1, SelectorID as SelectorID1, CustomSelect as CustomSelect1 } from './store/states/selection';
-export declare type SelectedItem<T extends SeletedItemData<any> = any> = SelectedItem1<T>;
-export declare type SelectionFilter = SelectionFilter1;
-export declare type SelectionScope = SelectionScope1;
-export declare type Selector<T extends SeletedItemData<any> = any> = Selector1<T>;
-export declare type SelectorID = SelectorID1;
-export declare type CustomSelect = CustomSelect1;
-import { Message as Message1 } from './store/states/message';
-export declare type Message = Message1;