@veloceapps/sdk 5.0.9 → 5.0.10

package/fesm2015/veloce-sdk-cms.js

@@ -1083,16 +1083,10 @@ class ElementsResolver {
         this.uiDef = uiDef;
         this.renderableElements = [];
         this.sharedElements = [];
-        this.elements = this.transpileScripts(elements);
-        const flatElements = this.flattenElements(this.elements);
-        for (const el of flatElements) {
-            if (this.isSharedElement(el)) {
-                this.sharedElements.push(el);
-            }
-            else {
-                this.renderableElements.push(el);
-            }
-        }
+        const transpiledElements = this.transpileScripts(elements);
+        this.sharedElements = this.flattenElements(transpiledElements).filter(el => this.isSharedElement(el));
+        this.elements = transpiledElements.map(el => this.processElementMetadata(el)).filter(Boolean);
+        this.renderableElements = this.getRenderableElements(this.elements);
     }
     getNgComponents() {
         return this.renderableElements.map(el => this.resolveElement(el)).filter(Boolean);
@@ -1118,8 +1112,19 @@ class ElementsResolver {
     isSharedElement(el) {
         return Boolean(el.isShared) && el.type !== 'REFERENCE';
     }
+    getRenderableElements(elements) {
+        const renderable = [];
+        for (const el of elements) {
+            if (!this.isSharedElement(el)) {
+                const children = el.children.filter(child => !this.isSharedElement(child));
+                const renderableChildren = this.getRenderableElements(children);
+                renderable.push(Object.assign(Object.assign({}, el), { children }), ...renderableChildren);
+            }
+        }
+        return renderable;
+    }
     getSharedElement(element) {
-        if (element.type !== 'REFERENCE') {
+        if (!element.reference) {
             return;
         }
         return this.sharedElements.find(el => element.reference === el.name);
@@ -1136,28 +1141,37 @@ class ElementsResolver {
     }
     processElementMetadata(sourceElement) {
         var _a, _b;
-        const sharedElement = this.getSharedElement(sourceElement);
         let finalElement;
         if (sourceElement.type === 'REFERENCE') {
+            const sharedElement = this.getSharedElement(sourceElement);
             if (!sharedElement) {
                 console.warn(`Shared element "${sourceElement.reference}" not found`);
                 return;
             }
-            finalElement = Object.assign(Object.assign({}, sourceElement), { type: sharedElement.type, template: sharedElement.template, styles: ((_a = sharedElement.styles) !== null && _a !== void 0 ? _a : '') + '\n' + ((_b = sourceElement.styles) !== null && _b !== void 0 ? _b : ''), inputs: Object.assign(Object.assign({}, sharedElement.inputs), sourceElement.inputs), outputs: Object.assign(Object.assign({}, sharedElement.outputs), sourceElement.outputs) });
+            finalElement = Object.assign(Object.assign({}, sourceElement), { children: this.getSharedChildren(sharedElement.children, sourceElement.path), type: sharedElement.type, template: sharedElement.template, styles: ((_a = sharedElement.styles) !== null && _a !== void 0 ? _a : '') + '\n' + ((_b = sourceElement.styles) !== null && _b !== void 0 ? _b : ''), inputs: Object.assign(Object.assign({}, sharedElement.inputs), sourceElement.inputs), outputs: Object.assign(Object.assign({}, sharedElement.outputs), sourceElement.outputs) });
         }
         else {
             finalElement = sourceElement;
+            delete sourceElement.reference;
         }
         finalElement.template = this.resolveElementTemplate(finalElement);
         finalElement.styles = this.resolveElementStyles(finalElement);
-        return finalElement;
+        return Object.assign(Object.assign({}, finalElement), { children: finalElement.children
+                .map(child => this.processElementMetadata(child))
+                .filter(Boolean) });
+    }
+    getSharedChildren(children, parentPath) {
+        return children.map(c => {
+            if (!c.path) {
+                return c;
+            }
+            const [elName] = c.path.split('/').reverse();
+            const path = parentPath + '/' + elName;
+            return Object.assign(Object.assign({}, c), { path, children: this.getSharedChildren(c.children, path) });
+        });
     }
-    resolveElement(sourceElement) {
+    resolveElement(element) {
         var _a;
-        const element = this.processElementMetadata(sourceElement);
-        if (!element) {
-            return;
-        }
         const config = CONFIG[element.type];
         const defaultPlugins = (_a = DEFAULT_PLUGINS[this.uiDef.type]) !== null && _a !== void 0 ? _a : [];
         if (!config) {
@@ -1173,7 +1187,7 @@ class ElementsResolver {
                 { provide: DEFAULT_PLUGINS_TOKEN, useValue: defaultPlugins },
                 { provide: UI_DEFINITION_METADATA, useValue: this.uiDef },
                 { provide: ELEMENT_METADATA, useValue: element },
-                { provide: SHARED_ELEMENT_METADATA, useValue: this.getSharedElement(sourceElement) },
+                { provide: SHARED_ELEMENT_METADATA, useValue: this.getSharedElement(element) },
                 { provide: ELEMENT_CONFIG, useValue: config },
                 { provide: VENDOR_MAP, useValue: vendorMap },
             ] });
@@ -1201,12 +1215,14 @@ class LauncherService {
         this.compiler = compiler;
         this.dynamicModuleService = dynamicModuleService;
     }
-    compileModule(elements, uiDefs) {
-        this.module = this.getModule(elements, uiDefs);
+    compileModule(uiDef, elements) {
+        const elementsResolver = new ElementsResolver(uiDef, elements);
+        this.dynamicModuleService.elementsTree = elementsResolver.elements;
+        this.module = this.getModule(elementsResolver.getNgComponents());
         return from(this.compiler.compileModuleAndAllComponentsAsync(this.module)).pipe(tap(m => {
             this.dynamicModuleService.componentFactories = m.componentFactories;
             this.moduleInstance = m;
-        }));
+        }), map(m => ({ module: m, elements: elementsResolver.elements })));
     }
     destroy() {
         if (this.moduleInstance) {
@@ -1218,16 +1234,14 @@ class LauncherService {
             this.module = undefined;
         }
     }
-    getModule(elements, uiDef) {
+    getModule(components) {
         const staticComponents = [ElementChildrenComponent, ElementRendererComponent, CustomTemplateDirective];
-        const elementsResolver = new ElementsResolver(uiDef, elements);
-        this.dynamicModuleService.elementsTree = elementsResolver.elements;
         let DynamicModule = class DynamicModule {
         };
         DynamicModule = __decorate([
             NgModule({
                 imports: [CommonModule, FormsModule, ReactiveFormsModule, FederatedModule, DragDropModule],
-                declarations: [...staticComponents, ...elementsResolver.getNgComponents()],
+                declarations: [...staticComponents, ...components],
                 jit: true,
             })
         ], DynamicModule);
@@ -1295,10 +1309,13 @@ class PreviewComponent {
             return;
         }
         const _a = this.uiDefinition, { children } = _a, uiDefinitionMeta = __rest(_a, ["children"]);
-        this.elements = this.elementToMetadataSafe(children);
-        const compilation$ = this.launcherService.compileModule(this.elements, uiDefinitionMeta);
+        const elements = this.elementToMetadataSafe(children);
+        const compilation$ = this.launcherService.compileModule(uiDefinitionMeta, elements);
         forkJoin([compilation$, this.initializeConfiguration$()])
-            .pipe(tap(() => this.state$.next({ loading: false, failure: false })), catchError(error => {
+            .pipe(tap(([result]) => {
+            this.elements = result.elements;
+            this.state$.next({ loading: false, failure: false });
+        }), catchError(error => {
             var _a, _b;
             console.error(error);
             if (!((_b = (_a = this.uiDefinition) === null || _a === void 0 ? void 0 : _a.properties) === null || _b === void 0 ? void 0 : _b.suppressToastMessages)) {