@metadev/daga 1.4.2 → 1.5.0

package/lib/diagram-editor/diagram/diagram-node.d.ts

@@ -8,7 +8,7 @@ import { DiagramField } from './diagram-field';
 import { DiagramModel } from './diagram-model';
 import { DiagramPort } from './diagram-port';
 import { PropertySet, ValueSet } from './diagram-property';
-import { DiagramSection } from './diagram-section';
+import { DiagramSection, DiagramSectionGeometry } from './diagram-section';
 /**
  * Default values of the look of a diagram node.
  * @see DIAGRAM_NODE_TYPE_DEFAULTS
@@ -36,6 +36,14 @@ export declare const DIAGRAM_NODE_TYPE_DEFAULTS: {
     priority: number;
     properties: never[];
 };
+export type DiagramNodeGeometry = {
+    readonly coords: Point;
+    readonly width: number;
+    readonly height: number;
+    readonly sections: {
+        [sectionId: string]: DiagramSectionGeometry;
+    };
+};
 /**
  * A node type, which holds properties that nodes of this type share in common.
  * @see NodeTypeConfig
@@ -99,10 +107,10 @@ export declare class DiagramNode extends DiagramElement {
      */
     coords: Point;
     /**
-     * Collaborative timestamp for coords.
+     * Collaborative timestamp for SetGeometryCollabActions.
      * @public
      */
-    coordsTimestamp?: CollabTimestamp;
+    geometryTimestamp: CollabTimestamp | null;
     /**
      * Dimension of this node along the x axis.
      * @public
@@ -119,7 +127,8 @@ export declare class DiagramNode extends DiagramElement {
      */
     get name(): string;
     set name(name: string);
-    constructor(model: DiagramModel, type: DiagramNodeType, coords?: Point, id?: string);
+    constructor(model: DiagramModel, type: DiagramNodeType, coords: Point | undefined, id: string);
+    get removed(): boolean;
     updateInView(): void;
     getPriority(): number;
     /**
@@ -174,6 +183,16 @@ export declare class DiagramNode extends DiagramElement {
      * @param indexY A section index.
      */
     stretchSections(direction: Side, distance: number, indexX: number, indexY: number): void;
+    /**
+     * Returns the current values of all geometric properties (coordinates and dimensions) of this node and its sections.
+     * @public
+     */
+    getGeometry(): DiagramNodeGeometry;
+    /**
+     * Sets all geometric properties (coordinates and dimensions) of this node and its sections.
+     * @public
+     */
+    setGeometry(geometry: DiagramNodeGeometry): void;
 }
 export declare class DiagramNodeSet extends DiagramEntitySet<DiagramNode> {
     private model;
@@ -192,9 +211,9 @@ export declare class DiagramNodeSet extends DiagramEntitySet<DiagramNode> {
      * @public
      * @param type The type of the node given as either the type itself or the id of the type.
      * @param coords The coordinates of the top left corner of the node in the diagram.
-     * @param id The id of the node. Should be left undefined unless a specific id is required.
+     * @param id The id of the node.
      * @returns The instanced node.
      */
-    new(type: DiagramNodeType | string, coords: Point, id?: string | undefined): DiagramNode;
+    new(type: DiagramNodeType | string, coords: Point, id: string): DiagramNode;
     remove(id: string): void;
 }

package/lib/diagram-editor/diagram/diagram-port.d.ts

@@ -54,7 +54,8 @@ export declare class DiagramPort extends DiagramElement {
      * @public
      */
     incomingConnections: DiagramConnection[];
-    constructor(model: DiagramModel, rootElement: DiagramNode | DiagramSection | undefined, coords: Point, direction: Side, id?: string);
+    constructor(model: DiagramModel, rootElement: DiagramNode | DiagramSection | undefined, coords: Point, direction: Side, id: string);
+    get removed(): boolean;
     updateInView(): void;
     /**
      * Add a connection to this port's list of outgoing connections.
@@ -94,6 +95,6 @@ export declare class DiagramPortSet extends DiagramEntitySet<DiagramPort> {
      * Instance a new port and add it to this set. This method is normally called when instancing an element with a port and it is rarely called by itself.
      * @private
      */
-    new(rootElement: DiagramNode | DiagramSection | undefined, coords: Point, direction: Side, id?: string | undefined): DiagramPort;
+    new(rootElement: DiagramNode | DiagramSection | undefined, coords: Point, direction: Side, id: string): DiagramPort;
     remove(id: string): void;
 }

package/lib/diagram-editor/diagram/diagram-property.d.ts

@@ -1,3 +1,4 @@
+import { CollabTimestamp, CollabTimestampSet } from './collab/primitives';
 /**
  * A property which is part of a property set and defines what values a value in a value set can take.
  * @see PropertySet
@@ -92,6 +93,11 @@ export declare enum Type {
      * @see Type.Option
      */
     OptionList = "option-list",
+    /**
+     * A type whose value must be a list of values picked from a set of options without repeated values.
+     * @see Type.Option
+     */
+    OptionSet = "option-set",
     /**
      * A type whose value must be a string without newline characters.
      */
@@ -104,6 +110,10 @@ export declare enum Type {
      * A type whose value must be a list of strings.
      */
     TextList = "text-list",
+    /**
+     * A type whose value must be a list of strings without repeated values.
+     */
+    TextSet = "text-set",
     /**
      * A type whose value must be a map with string keys and values.
      */
@@ -146,6 +156,13 @@ export declare class ValueSet {
     hiddenProperties: Property[];
     private values;
     private valueSets;
+    /**
+     * Collaborative timestamps for all keys in this.values that have ever been set,
+     * even if since they've since been set to the default value.
+     *
+     * Object values (in this.valueSets) store their own timestamps separately.
+     */
+    private ownTimestamps;
     constructor(propertySet: PropertySet, rootElement: unknown);
     /**
      * Get the value of the root element attribute under the given keys.
@@ -180,6 +197,23 @@ export declare class ValueSet {
     getValues(): {
         [key: string]: unknown;
     };
+    /**
+     * Returns the values for all keys present in the given object, including keys in sub-objects.
+     *
+     * @private
+     * @param values An object containing all values for keys present in the given object.
+     */
+    getValuesForKeys(keys: {
+        [key: string]: unknown;
+    }): {
+        [key: string]: unknown;
+    };
+    /**
+     * Obtain all CollabTimestamps in the set, including those corresponding to nested keys.
+     * @private
+     * @returns An object containing all the CollabTimestamps in the set.
+     */
+    getTimestamps(): CollabTimestampSet;
     /**
      * Check if the value under the key is not empty.
      * @private
@@ -191,7 +225,7 @@ export declare class ValueSet {
      * Check if the value under the key is not empty or the default value.
      * @private
      * @param key A key.
-     * @returns `true` if the value under the key is empty or the default value, `false` otherwise.
+     * @returns `true` if the value under the key is not empty or the default value, `false` otherwise.
      */
     hasSetValue(key: string): boolean;
     /**
@@ -215,6 +249,12 @@ export declare class ValueSet {
     setValues(values: {
         [key: string]: unknown;
     }): void;
+    /**
+     * Reset all timestamps and then set them to the given timestamps.
+     * @private
+     * @param values An object containing all the CollabTimestamps in the set.
+     */
+    setTimestamps(timestamps: CollabTimestampSet): void;
     /**
      * Writes the given values over the value set's existing values without resetting the existing values.
      * @private
@@ -223,6 +263,14 @@ export declare class ValueSet {
     overwriteValues(values: {
         [key: string]: unknown;
     }): void;
+    /**
+     * Variant of overwriteValues that applies last-writer-wins to each key, updating timestamps if appropriate.
+     * @private
+     * @param values An object containing all values to set the values to.
+     */
+    overwriteValuesLww(values: {
+        [key: string]: unknown;
+    }, timestamp: CollabTimestamp): void;
     /**
      * Set all the values of this set to the defaults.
      * If this set has a root element and any of its properties have root attributes, the root element's attributes are also set to the property's default value if one is provided.
@@ -270,17 +318,21 @@ export declare const empty: (a: unknown) => boolean;
  */
 export declare const equals: (a: unknown, b: unknown) => boolean;
 /**
- * Calculate the differences between the given values and return two objects, each containing the keys for which the values are different in each argument, containing the different values.
+ * Calculate the differences between the given objects and return two objects, each containing the keys for which the values are different in each argument, containing the different values.
  * @param a A dictionary.
  * @param b A dictionary.
- * @returns A tuple of two values with each containing the keys that have a different value in the corresponding argument compared to the other argument.
+ * @returns A tuple of two objects with each containing the keys that have a different value in the corresponding argument compared to the other argument.
  */
 export declare const diff: (a: {
     [key: string]: unknown;
 }, b: {
     [key: string]: unknown;
-}) => [{
-    [key: string]: unknown;
-}, {
-    [key: string]: unknown;
-}];
+}) => [
+    {
+        [key: string]: unknown;
+    },
+    {
+        [key: string]: unknown;
+    }
+];
+export declare const isObject: (x: unknown) => boolean;

package/lib/diagram-editor/diagram/diagram-section.d.ts

@@ -48,6 +48,11 @@ export declare const DIAGRAM_SECTION_MIN_WIDTH = 1;
  * @private
  */
 export declare const DIAGRAM_SECTION_MIN_HEIGHT = 1;
+export type DiagramSectionGeometry = {
+    readonly coords: Point;
+    readonly width: number;
+    readonly height: number;
+};
 /**
  * A section of a node which can have connections and display a property of the node.
  * @see DiagramConnection
@@ -100,7 +105,8 @@ export declare class DiagramSection extends DiagramElement {
      */
     get name(): string;
     set name(name: string);
-    constructor(model: DiagramModel, node: DiagramNode | undefined, indexXInNode: number, indexYInNode: number, coords: Point, width: number, height: number, id?: string);
+    constructor(model: DiagramModel, node: DiagramNode | undefined, indexXInNode: number, indexYInNode: number, coords: Point, width: number, height: number, id: string);
+    get removed(): boolean;
     updateInView(): void;
     getConfig(): SectionConfig | undefined;
     getMinWidth(): number;
@@ -143,6 +149,16 @@ export declare class DiagramSection extends DiagramElement {
      * @param distance A distance.
      */
     stretch(direction: Side, distance: number): void;
+    /**
+     * Returns the current values of all geometric properties (coordinates and dimensions) of this section.
+     * @public
+     */
+    getGeometry(): DiagramSectionGeometry;
+    /**
+     * Sets all geometric properties (coordinates and dimensions) of this section.
+     * @public
+     */
+    setGeometry(geometry: DiagramSectionGeometry): void;
 }
 export declare class DiagramSectionSet extends DiagramEntitySet<DiagramSection> {
     private model;
@@ -155,6 +171,6 @@ export declare class DiagramSectionSet extends DiagramEntitySet<DiagramSection>
      * Instance a new section and add it to this set. This method is normally called when instancing an element with a section and it is rarely called by itself.
      * @private
      */
-    new(node: DiagramNode, indexXInNode: number, indexYInNode: number, coords: Point, width: number, height: number, id?: string | undefined): DiagramSection;
+    new(node: DiagramNode, indexXInNode: number, indexYInNode: number, coords: Point, width: number, height: number, id: string): DiagramSection;
     remove(id: string): void;
 }

package/lib/property-editor/object-editor/object-editor.component.d.ts

@@ -17,12 +17,11 @@ export declare class ObjectEditorComponent {
     _valueSet?: ValueSet;
     get valueSet(): ValueSet | undefined;
     set valueSet(valueSet: ValueSet | undefined);
-    /** How many object-editors are parents of this object-editor. @private */
+    /** How many object-editor elements are parents of this object-editor element. @private */
     depth: number;
     Type: typeof Type;
+    getStyleClassName: (s: string) => string;
     constructor(cdr: ChangeDetectorRef, canvasProvider: CanvasProviderService);
-    displayProperty(property: Property | Event | string | undefined): void;
-    hideProperty(property: Property | Event | string | undefined): void;
     setValue(property: Property, value: unknown): void;
     dateToLocalDatetimeString(date: string | number | Date | null | undefined): string;
     localDatetimeStringToDate(string: string): Date;

package/lib/property-editor/option-list-editor/option-list-editor.component.d.ts

@@ -16,14 +16,18 @@ export declare class OptionListEditorComponent {
     labelsOfValue: string[];
     options: Option<unknown>[];
     valueInput?: unknown;
+    allowRepeats: boolean;
+    optionsNotPresentInValue: Option<unknown>[];
     disabled: boolean;
     valueChange: EventEmitter<unknown[]>;
     constructor(cdr: ChangeDetectorRef);
     getLabelOfValue(value: unknown): string;
+    hasValue(value: unknown): boolean;
     removeFromValue(index: number): void;
     addToValue(): void;
     clearInput(): void;
+    updateOptionsNotPresentInValue(): void;
     onKeyUp(event: KeyboardEvent): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<OptionListEditorComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<OptionListEditorComponent, "daga-option-list-editor", never, { "value": { "alias": "value"; "required": false; }; "options": { "alias": "options"; "required": false; }; "valueInput": { "alias": "valueInput"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; }, { "valueChange": "valueChange"; }, never, never, true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<OptionListEditorComponent, "daga-option-list-editor", never, { "value": { "alias": "value"; "required": false; }; "options": { "alias": "options"; "required": false; }; "valueInput": { "alias": "valueInput"; "required": false; }; "allowRepeats": { "alias": "allowRepeats"; "required": false; }; "optionsNotPresentInValue": { "alias": "optionsNotPresentInValue"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; }, { "valueChange": "valueChange"; }, never, never, true, never>;
 }

package/lib/property-editor/property-editor.component.d.ts

@@ -19,6 +19,7 @@ export declare class PropertyEditorComponent implements AfterViewInit, PropertyE
     _valueSet: ValueSet | undefined;
     get valueSet(): ValueSet | undefined;
     set valueSet(valueSet: ValueSet | undefined);
+    settings?: boolean;
     constructor(cdr: ChangeDetectorRef);
     ngAfterViewInit(): void;
     selectPanel(): d3.Selection<HTMLDivElement, unknown, null, undefined>;
@@ -26,3 +27,4 @@ export declare class PropertyEditorComponent implements AfterViewInit, PropertyE
     static ɵfac: i0.ɵɵFactoryDeclaration<PropertyEditorComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<PropertyEditorComponent, "daga-property-editor", never, { "location": { "alias": "location"; "required": false; }; "direction": { "alias": "direction"; "required": false; }; "width": { "alias": "width"; "required": false; }; "valueSet": { "alias": "valueSet"; "required": false; }; }, {}, never, never, true, never>;
 }
+export declare const getStyleClassName: (s: string) => string;

package/lib/property-editor/property-settings/property-settings.component.d.ts

@@ -0,0 +1,35 @@
+import { AfterViewInit, ChangeDetectorRef, ElementRef } from '@angular/core';
+import { Property, Type, ValueSet } from '../../diagram-editor/diagram/diagram-property';
+import { Canvas } from '../../interfaces/canvas';
+import { CanvasProviderService } from '../../services/canvas-provider.service';
+import { Point } from '../../util/canvas-util';
+import * as i0 from "@angular/core";
+/**
+ * Editor of the settings of a property editor, such as what properties are displayed and hidden and in what order.
+ * @see PropertyEditor
+ * @see ValueSet
+ * @private
+ */
+export declare class PropertySettingsComponent implements AfterViewInit {
+    private element;
+    private cdr;
+    private canvasProvider;
+    get canvas(): Canvas;
+    _valueSet?: ValueSet;
+    get valueSet(): ValueSet | undefined;
+    set valueSet(valueSet: ValueSet | undefined);
+    /** How many property-settings elements are parents of this property-settings element. @private */
+    depth: number;
+    Type: typeof Type;
+    getStyleClassName: (s: string) => string;
+    asString: (value: unknown) => string;
+    constructor(element: ElementRef, cdr: ChangeDetectorRef, canvasProvider: CanvasProviderService);
+    ngAfterViewInit(): void;
+    private addListeners;
+    getClosestDropbarIndex(pointerCoords: Point): number;
+    displayProperty(property: Property | Event | string | undefined): void;
+    hideProperty(property: Property | Event | string | undefined): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<PropertySettingsComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<PropertySettingsComponent, "daga-property-settings", never, { "valueSet": { "alias": "valueSet"; "required": false; }; "depth": { "alias": "depth"; "required": false; }; }, {}, never, never, true, never>;
+}
+export declare const asString: (value: unknown) => string;

package/lib/property-editor/text-list-editor/text-list-editor.component.d.ts

@@ -13,15 +13,17 @@ export declare class TextListEditorComponent {
     set value(value: string[]);
     get value(): string[];
     valueInput: string;
+    allowRepeats: boolean;
     disabled: boolean;
     valueChange: EventEmitter<string[]>;
     constructor(cdr: ChangeDetectorRef);
     getValueFromEvent(event: Event): string;
+    hasValue(value: string): boolean;
     removeFromValue(index: number): void;
     editFromValue(item: string, index: number): void;
     addToValue(): void;
     clearInput(): void;
     onKeyUp(event: KeyboardEvent): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<TextListEditorComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<TextListEditorComponent, "daga-text-list-editor", never, { "value": { "alias": "value"; "required": false; }; "valueInput": { "alias": "valueInput"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; }, { "valueChange": "valueChange"; }, never, never, true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<TextListEditorComponent, "daga-text-list-editor", never, { "value": { "alias": "value"; "required": false; }; "valueInput": { "alias": "valueInput"; "required": false; }; "allowRepeats": { "alias": "allowRepeats"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; }, { "valueChange": "valueChange"; }, never, never, true, never>;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@metadev/daga",
   "description": "Diagramming engine for editing models on the Web. Made by Metadev.",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "author": "Metadev (https://metadev.pro)",
   "license": "SEE LICENSE IN LICENSE.md",
   "repository": "git+https://github.com/metadevpro/daga-tutorial.git",
@@ -18,10 +18,10 @@
     "angular"
   ],
   "peerDependencies": {
-    "@angular/common": "^17.0.0",
-    "@angular/core": "^17.0.0",
-    "@angular/forms": "^17.0.0",
-    "d3": "^7.8.5",
+    "@angular/common": "^18.0.1",
+    "@angular/core": "^18.0.1",
+    "@angular/forms": "^18.0.1",
+    "d3": "^7.9.0",
     "rxjs": "~7.8.1",
     "uuid": "^9.0.0"
   },