skandha-facets 0.7.0 → 0.9.0

package/Addition.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { host, maybe } from 'aspiration';
+import { host } from 'aspiration';
 import { data, operation } from 'skandha';
 export class Addition {
     constructor() {
@@ -23,9 +23,9 @@ export class Addition {
     }
     add(values) {
         return (cbs) => {
-            maybe(cbs.storeLocation).bind(cbs)();
+            cbs.storeLocation && cbs.storeLocation();
             this.item = cbs.createItem();
-            maybe(cbs.highlightNewItem).bind(cbs)();
+            cbs.highlightNewItem && cbs.highlightNewItem();
         };
     }
     confirm() {
@@ -37,7 +37,7 @@ export class Addition {
     cancel() {
         return (cbs) => {
             this._reset();
-            maybe(cbs.restoreLocation).bind(cbs)();
+            cbs.restoreLocation && cbs.restoreLocation();
         };
     }
     _reset() {
@@ -59,7 +59,7 @@ __decorate([
 ], Addition.prototype, "parentId", void 0);
 __decorate([
     operation,
-    host
+    host(['values'])
 ], Addition.prototype, "add", null);
 __decorate([
     operation,

package/Deletion.js

@@ -21,5 +21,5 @@ Object.defineProperty(Deletion, "className", {
 });
 __decorate([
     operation,
-    host
+    host(['itemIds'])
 ], Deletion.prototype, "delete", null);

package/DragAndDrop.js

@@ -58,7 +58,7 @@ __decorate([
 ], DragAndDrop.prototype, "hoverPosition", void 0);
 __decorate([
     operation,
-    host
+    host(['dropPosition'])
 ], DragAndDrop.prototype, "drop", null);
 __decorate([
     operation({ log: false })

package/Editing.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { host, maybe } from 'aspiration';
+import { host } from 'aspiration';
 import { data, operation } from 'skandha';
 export class Editing {
     constructor() {
@@ -19,7 +19,7 @@ export class Editing {
         return (cbs) => {
             cbs.saveItem();
             this.isEditing = false;
-            maybe(cbs.refreshView).bind(cbs)();
+            cbs.refreshView && cbs.refreshView();
         };
     }
     cancel() {
@@ -44,7 +44,7 @@ __decorate([
 ], Editing.prototype, "isEditing", void 0);
 __decorate([
     operation,
-    host
+    host(['values'])
 ], Editing.prototype, "save", null);
 __decorate([
     operation,

package/Filtering.d.ts

@@ -1,13 +1,11 @@
-import { GetterT } from 'skandha';
 import { FilteringCbs, FilterT } from './FilteringCbs';
 export type { FilteringCbs } from './FilteringCbs';
 export declare class Filtering<ValueT = any> {
     static className: () => string;
     isEnabled: boolean;
     filter: FilterT;
-    inputItems?: Array<ValueT>;
-    get filteredItems(): any[] | undefined;
+    inputItems: Array<ValueT>;
+    get filteredItems(): any[];
     apply(filter: FilterT): (cbs: FilteringCbs['apply']) => void;
     setEnabled(flag: boolean): (cbs: FilteringCbs['setEnabled']) => void;
 }
-export declare const filteringUsesInputItems: (getItems: GetterT, transform?: Function) => (ctr: any) => void;

package/Filtering.js

@@ -4,8 +4,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { host } from 'aspiration';
-import { data, mapDataToFacet, operation } from 'skandha';
+import { host, stub } from 'aspiration';
+import { data, operation } from 'skandha';
 export class Filtering {
     constructor() {
         Object.defineProperty(this, "isEnabled", {
@@ -24,7 +24,7 @@ export class Filtering {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: stub()
         });
     }
     get filteredItems() {
@@ -62,10 +62,9 @@ __decorate([
 ], Filtering.prototype, "filteredItems", null);
 __decorate([
     operation,
-    host
+    host(['filter'])
 ], Filtering.prototype, "apply", null);
 __decorate([
     operation,
-    host
+    host(['flag'])
 ], Filtering.prototype, "setEnabled", null);
-export const filteringUsesInputItems = (getItems, transform) => mapDataToFacet([Filtering, 'inputItems'], getItems, transform);

package/Highlight.d.ts

@@ -1,4 +1,3 @@
-import { GetterT } from 'skandha';
 import { HighlightCbs } from './HighlightCbs';
 export type { HighlightCbs } from './HighlightCbs';
 export declare class Highlight<ValueT = any> {
@@ -7,4 +6,3 @@ export declare class Highlight<ValueT = any> {
     item?: ValueT;
     highlightItem(id: string): (cbs: HighlightCbs['highlightItem']) => void;
 }
-export declare const highlightUsesItemLookUpTable: (getItemById: GetterT) => (ctr: any) => void;

package/Highlight.js

@@ -4,8 +4,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { host, maybe } from 'aspiration';
-import { data, getm, mapDatasToFacet, operation, output, } from 'skandha';
+import { host } from 'aspiration';
+import { data, operation, output } from 'skandha';
 export class Highlight {
     constructor() {
         Object.defineProperty(this, "id", {
@@ -24,7 +24,7 @@ export class Highlight {
     highlightItem(id) {
         return (cbs) => {
             this.id = id;
-            maybe(cbs.scrollItemIntoView).bind(cbs)();
+            cbs.scrollItemIntoView && cbs.scrollItemIntoView();
         };
     }
 }
@@ -42,12 +42,5 @@ __decorate([
 ], Highlight.prototype, "item", void 0);
 __decorate([
     operation,
-    host
+    host(['id'])
 ], Highlight.prototype, "highlightItem", null);
-export const highlightUsesItemLookUpTable = (getItemById) => mapDatasToFacet([Highlight, 'item'], [
-    //
-    getItemById,
-    getm([Highlight, 'id']),
-], (itemById, id) => {
-    return itemById[id];
-});

package/Insertion.d.ts

@@ -1,11 +1,9 @@
-import { GetterT } from 'skandha';
 import { DragT, InsertionCbs } from './InsertionCbs';
 export type { DragT, DropPositionT, InsertionCbs } from './InsertionCbs';
 export declare type DragSourceT = (ctr: any) => DragT | undefined;
 export declare class Insertion<ValueT = any> {
     static className: () => string;
-    inputItems?: Array<ValueT>;
-    preview?: Array<ValueT>;
+    inputItems: Array<ValueT>;
+    preview: Array<ValueT>;
     insertItems(drag: DragT): (cbs: InsertionCbs['insertItems']) => void;
 }
-export declare const insertionUsesInputItems: (getItems: GetterT, transform?: Function) => (ctr: any) => void;

package/Insertion.js

@@ -4,8 +4,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { host } from 'aspiration';
-import { input, mapDataToFacet, operation, output } from 'skandha';
+import { host, stub } from 'aspiration';
+import { input, operation, output } from 'skandha';
 import { getPreview } from './lib/getPreview';
 export class Insertion {
     constructor() {
@@ -13,13 +13,13 @@ export class Insertion {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: stub()
         });
         Object.defineProperty(this, "preview", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: stub()
         });
     }
     insertItems(drag) {
@@ -45,6 +45,5 @@ __decorate([
 ], Insertion.prototype, "preview", void 0);
 __decorate([
     operation,
-    host
+    host(['drag'])
 ], Insertion.prototype, "insertItems", null);
-export const insertionUsesInputItems = (getItems, transform) => mapDataToFacet([Insertion, 'inputItems'], getItems, transform);

package/Labelling.d.ts

@@ -1,11 +1,9 @@
-import { GetterT } from 'skandha';
 import { IdsByLabelT, ItemsByLabelT, LabellingCbs, LabelValueT } from './LabellingCbs';
 export type { LabellingCbs } from './LabellingCbs';
 export declare class Labelling {
     static className: () => string;
     idsByLabel: IdsByLabelT;
     ids: (label: string) => any[];
-    itemsByLabel?: ItemsByLabelT;
+    itemsByLabel: ItemsByLabelT;
     setLabel(labelValue: LabelValueT): (cbs: LabellingCbs['setLabel']) => void;
 }
-export declare const labellingActsOnItems: (getItemById: GetterT) => (ctr: any) => void;

package/Labelling.js

@@ -4,9 +4,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { host } from 'aspiration';
-import { data, getm, input, mapDatasToFacet, operation, } from 'skandha';
-import { lookUp } from './internal/utils';
+import { host, stub } from 'aspiration';
+import { data, input, operation } from 'skandha';
 export class Labelling {
     constructor() {
         Object.defineProperty(this, "idsByLabel", {
@@ -25,7 +24,7 @@ export class Labelling {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: stub()
         });
     }
     setLabel(labelValue) {
@@ -57,12 +56,5 @@ __decorate([
 ], Labelling.prototype, "itemsByLabel", void 0);
 __decorate([
     operation,
-    host
+    host(['labelValue'])
 ], Labelling.prototype, "setLabel", null);
-export const labellingActsOnItems = (getItemById) => {
-    return mapDatasToFacet([Labelling, 'itemsByLabel'], [
-        //
-        getItemById,
-        getm([Labelling, 'idsByLabel']),
-    ], (itemById, idsByLabel) => Object.fromEntries(Object.entries(idsByLabel).map(([label, ids]) => lookUp(ids, itemById))));
-};

package/Selection.d.ts

@@ -1,14 +1,11 @@
-import { GetterT } from 'skandha';
 import { SelectionCbs, SelectionParamsT } from './SelectionCbs';
 export type { SelectionCbs, SelectionParamsT } from './SelectionCbs';
 export declare class Selection<ValueT = any> {
     static className: () => string;
-    selectableIds?: Array<string>;
+    selectableIds: Array<string>;
     ids: Array<string>;
     anchorId?: string;
-    items?: Array<ValueT>;
+    items: Array<ValueT>;
     selectItem(selectionParams: SelectionParamsT): (cbs: SelectionCbs['selectItem']) => void;
 }
 export declare function handleSelectItem(facet: Selection, { itemId, isShift, isCtrl }: SelectionParamsT): void;
-export declare const selectionUsesItemLookUpTable: (getItemById: GetterT) => (ctr: any) => void;
-export declare const selectionUsesSelectableIds: (getIds: GetterT, transform?: ((x: any) => string[]) | undefined) => (ctr: any) => void;

package/Selection.js

@@ -4,9 +4,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { host } from 'aspiration';
-import { data, getm, input, mapDatasToFacet, mapDataToFacet, operation, output, } from 'skandha';
-import { lookUp, range } from './internal/utils';
+import { host, stub } from 'aspiration';
+import { data, input, operation, output } from 'skandha';
+import { range } from './internal/utils';
 const selectItemDefaultCbs = (selection) => ({
     selectItem: function () {
         handleSelectItem(selection, this.selectionParams);
@@ -18,7 +18,7 @@ export class Selection {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: stub()
         });
         Object.defineProperty(this, "ids", {
             enumerable: true,
@@ -36,7 +36,7 @@ export class Selection {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: stub()
         });
     }
     selectItem(selectionParams) {
@@ -65,7 +65,7 @@ __decorate([
 ], Selection.prototype, "items", void 0);
 __decorate([
     operation,
-    host(selectItemDefaultCbs)
+    host(['selectionParams'], selectItemDefaultCbs)
 ], Selection.prototype, "selectItem", null);
 export function handleSelectItem(facet, { itemId, isShift, isCtrl }) {
     if (itemId === undefined) {
@@ -98,11 +98,3 @@ export function handleSelectItem(facet, { itemId, isShift, isCtrl }) {
         facet.anchorId = itemId;
     }
 }
-export const selectionUsesItemLookUpTable = (getItemById) => mapDatasToFacet([Selection, 'items'], [
-    //
-    getItemById,
-    getm([Selection, 'ids']),
-], (itemById, ids) => {
-    return lookUp(ids, itemById);
-});
-export const selectionUsesSelectableIds = (getIds, transform) => mapDataToFacet([Selection, 'selectableIds'], getIds, transform);

package/index.d.ts

@@ -1,4 +1 @@
-export { selectionUsesItemLookUpTable, selectionUsesSelectableIds, } from "./Selection";
-export { highlightUsesItemLookUpTable } from "./Highlight";
-export { filteringUsesInputItems } from "./Filtering";
-export { insertionUsesInputItems } from "./Insertion";
+export {};

package/index.js

@@ -1,4 +1 @@
-export { selectionUsesItemLookUpTable, selectionUsesSelectableIds, } from "./Selection";
-export { highlightUsesItemLookUpTable } from "./Highlight";
-export { filteringUsesInputItems } from "./Filtering";
-export { insertionUsesInputItems } from "./Insertion";
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skandha-facets",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "description": "Facets for use with the skandha library",
   "main": "index.js",
   "repository": "https://github.com/mnieber/skandha-facets.git",
@@ -9,8 +9,8 @@
   "types": "index.d.ts",
   "prepublish": "tsc",
   "peerDependencies": {
-    "skandha": ">=0.7.0",
-    "aspiration": ">=0.1.1"
+    "skandha": ">=0.9.0",
+    "aspiration": ">=0.3.1"
   },
   "devDependencies": {
     "typescript": "^4.0.3"

package/policies/highlightIsCorrectedOnFilterChange.d.ts

@@ -1,2 +1,4 @@
-import { Filtering } from "../Filtering";
+import { Filtering } from '../Filtering';
+import { Highlight } from '../Highlight';
 export declare function highlightIsCorrectedOnFilterChange(facet: Filtering): void;
+export declare function correctHighlight(highlight: Highlight, inputItemIds: any[], filteredItemIds: any[]): void;

package/policies/highlightIsCorrectedOnFilterChange.js

@@ -1,5 +1,23 @@
-import { getf, getc } from "skandha";
-import { Highlight } from "../Highlight";
+import { getc, getf } from 'skandha';
+import { Highlight } from '../Highlight';
+export function highlightIsCorrectedOnFilterChange(facet) {
+    var _a;
+    if (facet.isEnabled) {
+        correctHighlight(getf(Highlight, getc(facet)), (facet.inputItems || []).map((x) => x.id), ((_a = facet.filteredItems) !== null && _a !== void 0 ? _a : []).map((x) => x.id));
+    }
+}
+export function correctHighlight(highlight, inputItemIds, filteredItemIds) {
+    if (highlight.id &&
+        inputItemIds.includes(highlight.id) &&
+        !filteredItemIds.includes(highlight.id)) {
+        const highlightedItemIdx = inputItemIds.indexOf(highlight.id);
+        const newIdx = _findNeighbourIdx(filteredItemIds, inputItemIds, highlightedItemIdx, inputItemIds.length, 1) ||
+            _findNeighbourIdx(filteredItemIds, inputItemIds, highlightedItemIdx, -1, -1);
+        if (newIdx) {
+            highlight.highlightItem(inputItemIds[newIdx.result]);
+        }
+    }
+}
 function _findNeighbourIdx(filteredItems, allItems, beginIndex, endIndex, step) {
     for (var idx = beginIndex; idx !== endIndex; idx += step) {
         if (filteredItems.includes(allItems[idx])) {
@@ -8,23 +26,3 @@ function _findNeighbourIdx(filteredItems, allItems, beginIndex, endIndex, step)
     }
     return undefined;
 }
-export function highlightIsCorrectedOnFilterChange(facet) {
-    var _a;
-    const ctr = getc(facet);
-    if (facet.isEnabled) {
-        const highlight = getf(Highlight, ctr).id;
-        const inputItems = facet.inputItems;
-        const filteredItemIds = ((_a = facet.filteredItems) !== null && _a !== void 0 ? _a : []).map((x) => x.id);
-        const inputIds = (inputItems || []).map((x) => x.id);
-        if (highlight &&
-            inputIds.includes(highlight) &&
-            !filteredItemIds.includes(highlight)) {
-            const highlightedItemIdx = inputIds.indexOf(highlight);
-            const newIdx = _findNeighbourIdx(filteredItemIds, inputIds, highlightedItemIdx, inputIds.length, 1) ||
-                _findNeighbourIdx(filteredItemIds, inputIds, highlightedItemIdx, -1, -1);
-            if (newIdx) {
-                getf(Highlight, ctr).highlightItem(inputIds[newIdx.result]);
-            }
-        }
-    }
-}

package/policies/insertionPreviewUsesDragSources.d.ts

@@ -1,2 +1,2 @@
-import { DragSourceT } from "../Insertion";
-export declare const insertionPreviewUsesDragSources: (dragSources: DragSourceT[]) => (ctr: any) => void;
+import { DragSourceT } from '../Insertion';
+export declare const insertionPreviewUsesDragSources: (dragSources: DragSourceT[], ctr: any) => (inputItems: any[]) => any[];

package/policies/insertionPreviewUsesDragSources.js

@@ -1,13 +1,8 @@
-import { Insertion } from "../Insertion";
-import { findMap } from "../internal/utils";
-import { getPreview } from "../lib/getPreview";
-import { mapDataToFacet, getf, getc } from "skandha";
-export const insertionPreviewUsesDragSources = (dragSources) => mapDataToFacet([Insertion, "preview"], getf(Insertion), (insertion) => {
-    const ctr = getc(insertion);
+import { findMap } from '../internal/utils';
+import { getPreview } from '../lib/getPreview';
+export const insertionPreviewUsesDragSources = (dragSources, ctr) => (inputItems) => {
     const drag = findMap((dragSource) => dragSource(ctr), dragSources);
-    const inputItems = insertion.inputItems;
-    const preview = drag
+    return drag
         ? getPreview(inputItems !== null && inputItems !== void 0 ? inputItems : [], drag.targetItemId, drag.isBefore, drag.payload)
         : inputItems !== null && inputItems !== void 0 ? inputItems : [];
-    return preview;
-});
+};