@bfwk/di-editor - npm Package Compare versions

Comparing version 0.6.7003 to 0.7.0

CHANGELOG.md

@@ -6,13 +6,10 @@ # Change Log
 
-## 0.6.7003 (2021-04-21)
+# [0.7.0](https://github.com/salesforce/builder-framework/compare/v0.6.49...v0.7.0) (2021-07-28)
 
+**Note:** Version bump only for package @bfwk/di-editor
 
-### Features
 
-* refactor from lbf to bfwk @W-9091273 ([#1](https://github.com/salesforce/builder-framework/issues/1)) ([5300a61](https://github.com/salesforce/builder-framework/commit/5300a6117f7f1c763442d7e50d157443e22c1e36))
 
 
 
-
-
 ## [0.6.7](https://git.soma.salesforce.com/BuilderFramework/builder-framework/compare/v0.6.6...v0.6.7) (2021-04-05)
@@ -19,0 +16,0 @@

dist/index.js

@@ -120,2 +120,4 @@ import { ObservableCreator, clone, isEqual, WireValueChangeObservers, generateGuid, generateAdapterId, createWireAdapterFactory, configureObservers } from '@bfwk/utils';
             let sourceEventLabel = eventName;
+            let sourceEventDescription = '';
+            let sourceEventPropertyLabels = {};
             const propertyDescription = (await this.sourceSelectors[0]
@@ -126,4 +128,13 @@ .shapeProviderProvider(componentName)
                 const eventSchema = propertyDescription.events[eventName];
-                if (eventSchema && eventSchema.title) {
-                    sourceEventLabel = eventSchema.title;
+                if (eventSchema) {
+                    if (eventSchema.title) {
+                        sourceEventLabel = eventSchema.title;
+                    }
+                    if (eventSchema.description) {
+                        sourceEventDescription = eventSchema.description;
+                    }
+                    // Pass-through properties bag
+                    if (eventSchema.properties) {
+                        sourceEventPropertyLabels = eventSchema.properties;
+                    }
                 }
@@ -134,5 +145,12 @@ }
                 eventLabel: sourceEventLabel,
+                eventDescription: sourceEventDescription,
+                eventPropertyLabels: sourceEventPropertyLabels,
             };
         }
-        return { componentLabel: '', eventLabel: '' };
+        return {
+            componentLabel: '',
+            eventLabel: '',
+            eventDescription: '',
+            eventPropertyLabels: {},
+        };
     }
@@ -190,2 +208,3 @@ async getSourceEventContext(sourceEvent) {
                         events: baseDescription.events,
+                        referenceMap: baseDescription.referenceMap,
                     };
@@ -204,3 +223,2 @@ return Promise.resolve(newDescription);
                 .sourceEvent;
-            const eventContext = await this.getSourceEventContext(sourceEvent);
             const editorData = this.builderSpecificData
@@ -210,8 +228,18 @@ ? this.builderSpecificData
             editorData.suppressPublish = true;
-            if (eventContext) {
-                const contextMap = this.convertContextsToMap();
-                contextMap.set(eventContext.contextName, eventContext.schema);
-                editorData.contexts = contextMap;
+            editorData.enableExpressions = true;
+            editorData.enableBinding = true;
+            const contextMap = this.convertContextsToMap();
+            if (!this.contexts || !(this.contexts.length > 0)) {
+                const eventContext = await this.getSourceEventContext(sourceEvent);
+                if (eventContext) {
+                    contextMap.set(eventContext.contextName, eventContext.schema);
+                }
             }
-            const descriptionProvider = this.targetSelectors[0].shapeProviderProvider(targetService.componentName);
+            editorData.contexts = contextMap;
+            const serviceParams = {
+                serviceTypeName: this._diValue.targetService.targetType,
+                serviceName: this._diValue.targetService.targetName,
+                methodName: this._diValue.targetService.targetMethod,
+            };
+            const descriptionProvider = this.targetSelectors[0].shapeProviderProvider(targetService && targetService.componentName, serviceParams);
             const revisedProvider = await this.transformDescription(descriptionProvider);
@@ -230,5 +258,6 @@ this.propertySheet = this.propertySheetFactory.createMetadataDrivenPropertySheet(revisedProvider, this.convertToPropertyState(targetService, this._diValue.bindings), editorData);
     convertToPropertyState(targetService, bindings) {
-        let bindingState = {};
+        const bindingState = {};
         bindingState.fqn = targetService.componentName;
         bindingState.id = targetService.instanceIdentifier;
+        bindings = bindings || [];
         bindings.forEach(binding => {
@@ -263,3 +292,8 @@ bindingState[binding.targetElementName] = {
                 instanceIdentifier: targetService.instanceIdentifier,
-                extendedProperties: { componentName: targetService.componentName },
+                extendedProperties: {
+                    componentName: targetService.componentName,
+                    targetType: targetService.targetType,
+                    targetName: targetService.targetName,
+                    targetMethod: targetService.targetMethod,
+                },
             };
@@ -298,3 +332,6 @@ }
             targetService.extendedProperties &&
-            targetService.extendedProperties.componentName) {
+            targetService.extendedProperties.componentName &&
+            targetService.extendedProperties.targetType &&
+            targetService.extendedProperties.targetName &&
+            targetService.extendedProperties.targetMethod) {
             return {
@@ -304,2 +341,5 @@ kind: targetService.kind,
                 componentName: targetService.extendedProperties.componentName,
+                targetType: targetService.extendedProperties.targetType,
+                targetName: targetService.extendedProperties.targetName,
+                targetMethod: targetService.extendedProperties.targetMethod,
             };
@@ -329,3 +369,3 @@ }
         this.config = {
-            iconName: 'utility.edit',
+            iconName: 'utility.edit', // TODO this may need a specific icon eventually, need UX input
         };
@@ -352,3 +392,3 @@ this.pubSub = pubSub;
         this.config = {
-            iconName: 'utility.delete',
+            iconName: 'utility.delete', // TODO this may need a specific icon eventually, need UX input
         };
@@ -386,4 +426,4 @@ this.pubSub = pubSub;
             .setFeatureSet(CORE);
-        const customEditorsWithExpressionEditor = this.addExpressionEditor(customEditorsByPropertyType);
-        for (let [key, value] of customEditorsWithExpressionEditor) {
+        const customEditorsWithExpressionEditor = customEditorsByPropertyType;
+        for (const [key, value] of customEditorsWithExpressionEditor) {
             propertySheetFactoryBuilder.setCustomEditorByPropertyType(key, value);
@@ -445,7 +485,2 @@ }
     }
-    addExpressionEditor(customEditors) {
-        const editors = customEditors;
-        editors.set('String', 'builder_framework-expression-property-editor-ui');
-        return editors;
-    }
 }
@@ -452,0 +487,0 @@ const getDIEditorUiDefinition = () => {

dist/types/di-editor-manager.d.ts

@@ -25,4 +25,3 @@ import { PropertyValidationService, PropertySheetFactory } from '@bfwk/property-editor';
     private handleDocumentModelChange;
-    private addExpressionEditor;
 }
 export declare const getDIEditorUiDefinition: () => void;

dist/types/di-editor.d.ts

 import { Observable, Guid } from '@bfwk/utils';
-import { Json } from '@lcem/declarative-type-validator';
+import { Json } from '@lcem/meta-schemas';
 import { PubSub } from '@bfwk/pub-sub';
@@ -13,2 +13,5 @@ import { DIPubSubEventPayload, DINode } from '@bfwk/document-model';
     instanceIdentifier: string;
+    targetType: string;
+    targetName: string;
+    targetMethod: string;
 }
@@ -40,3 +43,3 @@ export declare type ComponentInstanceIdentifier = string;
 }
-export declare type ShapeProviderProvider = (type: string) => ShapeProvider;
+export declare type ShapeProviderProvider = (type: string, params?: any) => ShapeProvider;
 export declare type SelectorDataProvider = (ignore?: string) => any;
@@ -83,2 +86,4 @@ export interface Selector {
     eventLabel: string;
+    eventDescription: string;
+    eventPropertyLabels: {};
 }
@@ -85,0 +90,0 @@ export declare class DIEditor {

package.json

 {
   "name": "@bfwk/di-editor",
-  "version": "0.6.7003",
+  "version": "0.7.0",
   "description": "DI Editor",
@@ -9,3 +9,4 @@ "type": "module",
   "files": [
-    "dist/types"
+    "dist/types",
+    "index.xml"
   ],
@@ -31,11 +32,11 @@ "publishConfig": {
   "dependencies": {
-    "@bfwk/command": "0.6.7003",
-    "@bfwk/data-service": "0.6.7003",
-    "@bfwk/document-model": "0.6.7003",
-    "@bfwk/error-handler": "0.6.7003",
-    "@bfwk/instrumentation": "0.6.7003",
-    "@bfwk/property-editor": "0.6.7003",
-    "@bfwk/pub-sub": "0.6.7003",
-    "@bfwk/utils": "0.6.7003",
-    "@lcem/declarative-type-validator": "0.6.3"
+    "@bfwk/command": "0.7.0",
+    "@bfwk/data-service": "0.7.0",
+    "@bfwk/document-model": "0.7.0",
+    "@bfwk/error-handler": "0.7.0",
+    "@bfwk/instrumentation": "0.7.0",
+    "@bfwk/property-editor": "0.7.0",
+    "@bfwk/pub-sub": "0.7.0",
+    "@bfwk/utils": "0.7.0",
+    "@lcem/meta-schemas": "0.7.0"
   },
@@ -42,0 +43,0 @@ "devDependencies": {

No alert changes

Improved metrics

Total package byte prevSize

38259

increased by5.35%

Number of package files

11

increased by10%

Lines of code

657

increased by6.31%

Dependency changes

• + Added@lcem/meta-schemas@0.7.0

• + Added@bfwk/command@0.7.0(transitive)

• + Added@bfwk/data-service@0.7.0(transitive)

• + Added@bfwk/document-model@0.7.0(transitive)

• + Added@bfwk/error-handler@0.7.0(transitive)

• + Added@bfwk/expression-completion@0.7.0(transitive)

• + Added@bfwk/instrumentation@0.7.0(transitive)

• + Added@bfwk/property-editor@0.7.0(transitive)

• + Added@bfwk/pub-sub@0.7.0(transitive)

• + Added@bfwk/sf-selector@0.7.0(transitive)

• + Added@bfwk/store@0.7.0(transitive)

• + Added@bfwk/undo-redo@0.7.0(transitive)

• + Added@bfwk/utils@0.7.0(transitive)

• + Added@lcem/declarative-type@0.7.0(transitive)

• + Added@lcem/meta-schemas@0.7.0(transitive)

• + Added@lcem/unified-view-generator@0.7.0(transitive)

• + Added@lcem/unified-view-model@0.7.0(transitive)

• + Addedajv@8.17.1(transitive)

• + Addedajv-errors@3.0.0(transitive)

• + Addedajv-formats@2.1.1(transitive)

• + Addedfast-uri@3.0.6(transitive)

• + Addedimmutable-json-patch@1.1.2(transitive)

• + Addedjson-schema-traverse@1.0.0(transitive)

• + Addedrequire-from-string@2.0.2(transitive)

• - Removed@lcem/declarative-type-validator@0.6.3

• - Removed@bfwk/command@0.6.7003(transitive)

• - Removed@bfwk/data-service@0.6.7003(transitive)

• - Removed@bfwk/document-model@0.6.7003(transitive)

• - Removed@bfwk/error-handler@0.6.7003(transitive)

• - Removed@bfwk/expression-completion@0.6.7003(transitive)

• - Removed@bfwk/instrumentation@0.6.7003(transitive)

• - Removed@bfwk/property-editor@0.6.7003(transitive)

• - Removed@bfwk/pub-sub@0.6.7003(transitive)

• - Removed@bfwk/sf-selector@0.6.7003(transitive)

• - Removed@bfwk/store@0.6.7003(transitive)

• - Removed@bfwk/undo-redo@0.6.7003(transitive)

• - Removed@bfwk/utils@0.6.7003(transitive)

• - Removed@lcem/canonical-ui-metadata-schema@0.6.3(transitive)

• - Removed@lcem/declarative-type-validator@0.6.3(transitive)

• - Removed@lcem/declarative-ui-generator@0.6.3(transitive)

• - Removedajv@6.12.6(transitive)

• - Removedajv-errors@1.0.1(transitive)

• - Removedfast-json-stable-stringify@2.1.0(transitive)

• - Removedjson-schema-traverse@0.4.1(transitive)

• - Removedpunycode@2.3.1(transitive)

• - Removeduri-js@4.4.1(transitive)

• Updated@bfwk/command@0.7.0

• Updated@bfwk/data-service@0.7.0

• Updated@bfwk/document-model@0.7.0

• Updated@bfwk/error-handler@0.7.0

• Updated@bfwk/instrumentation@0.7.0

• Updated@bfwk/property-editor@0.7.0

• Updated@bfwk/pub-sub@0.7.0

• Updated@bfwk/utils@0.7.0