@lwc/engine-core 2.26.0 → 2.27.0

package/dist/engine-core.cjs.js

@@ -3229,6 +3229,9 @@ function isSameVnode(vnode1, vnode2) {
 function isVCustomElement(vnode) {
     return vnode.type === 3 /* VNodeType.CustomElement */;
 }
+function isVScopedSlotFragment(vnode) {
+    return vnode.type === 6 /* VNodeType.ScopedSlotFragment */;
+}
 
 /*
  * Copyright (c) 2018, salesforce.com, inc.
@@ -4067,7 +4070,7 @@ function allocateChildren(vnode, vm) {
   /* RenderMode.Light */
   ) {
     // slow path
-    allocateInSlot(vm, children); // save the allocated children in case this vnode is reused.
+    allocateInSlot(vm, children, vnode.owner); // save the allocated children in case this vnode is reused.
 
     vnode.aChildren = children; // every child vnode is now allocated, and the host should receive none directly, it receives them via the shadow!
 
@@ -4103,13 +4106,19 @@ function createViewModelHook(elm, vnode, renderer) {
   return vm;
 }
 
-function allocateInSlot(vm, children) {
-  var _a;
+function allocateInSlot(vm, children, owner) {
+  var _a, _b;
 
   const {
-    cmpSlots: oldSlots
+    cmpSlots: {
+      slotAssignments: oldSlotsMapping
+    }
   } = vm;
-  const cmpSlots = vm.cmpSlots = shared.create(null);
+  const cmpSlotsMapping = shared.create(null);
+  vm.cmpSlots = {
+    owner,
+    slotAssignments: cmpSlotsMapping
+  };
 
   for (let i = 0, len = children.length; i < len; i += 1) {
     const vnode = children[i];
@@ -4121,19 +4130,21 @@ function allocateInSlot(vm, children) {
     let slotName = '';
 
     if (isVBaseElement(vnode)) {
-      slotName = ((_a = vnode.data.attrs) === null || _a === void 0 ? void 0 : _a.slot) || '';
+      slotName = (_b = (_a = vnode.data.attrs) === null || _a === void 0 ? void 0 : _a.slot) !== null && _b !== void 0 ? _b : '';
+    } else if (isVScopedSlotFragment(vnode)) {
+      slotName = vnode.slotName;
     }
 
-    const vnodes = cmpSlots[slotName] = cmpSlots[slotName] || [];
+    const vnodes = cmpSlotsMapping[slotName] = cmpSlotsMapping[slotName] || [];
     shared.ArrayPush.call(vnodes, vnode);
   }
 
   if (shared.isFalse(vm.isDirty)) {
     // We need to determine if the old allocation is really different from the new one
     // and mark the vm as dirty
-    const oldKeys = shared.keys(oldSlots);
+    const oldKeys = shared.keys(oldSlotsMapping);
 
-    if (oldKeys.length !== shared.keys(cmpSlots).length) {
+    if (oldKeys.length !== shared.keys(cmpSlotsMapping).length) {
       markComponentAsDirty(vm);
       return;
     }
@@ -4141,15 +4152,15 @@ function allocateInSlot(vm, children) {
     for (let i = 0, len = oldKeys.length; i < len; i += 1) {
       const key = oldKeys[i];
 
-      if (shared.isUndefined(cmpSlots[key]) || oldSlots[key].length !== cmpSlots[key].length) {
+      if (shared.isUndefined(cmpSlotsMapping[key]) || oldSlotsMapping[key].length !== cmpSlotsMapping[key].length) {
         markComponentAsDirty(vm);
         return;
       }
 
-      const oldVNodes = oldSlots[key];
-      const vnodes = cmpSlots[key];
+      const oldVNodes = oldSlotsMapping[key];
+      const vnodes = cmpSlotsMapping[key];
 
-      for (let j = 0, a = cmpSlots[key].length; j < a; j += 1) {
+      for (let j = 0, a = cmpSlotsMapping[key].length; j < a; j += 1) {
         if (oldVNodes[j] !== vnodes[j]) {
           markComponentAsDirty(vm);
           return;
@@ -4349,6 +4360,18 @@ const SymbolIterator = Symbol.iterator;
 function addVNodeToChildLWC(vnode) {
     shared.ArrayPush.call(getVMBeingRendered().velements, vnode);
 }
+// [s]coped [s]lot [f]actory
+function ssf(slotName, factory) {
+    return {
+        type: 6 /* VNodeType.ScopedSlotFragment */,
+        factory,
+        owner: getVMBeingRendered(),
+        elm: undefined,
+        sel: undefined,
+        key: undefined,
+        slotName,
+    };
+}
 // [st]atic node
 function st(fragment, key) {
     return {
@@ -4432,9 +4455,31 @@ function s(slotName, data, children, slotset) {
         shared.assert.isTrue(shared.isArray(children), `h() 3rd argument children must be an array.`);
     }
     if (!shared.isUndefined(slotset) &&
-        !shared.isUndefined(slotset[slotName]) &&
-        slotset[slotName].length !== 0) {
-        children = slotset[slotName];
+        !shared.isUndefined(slotset.slotAssignments) &&
+        !shared.isUndefined(slotset.slotAssignments[slotName]) &&
+        slotset.slotAssignments[slotName].length !== 0) {
+        children = slotset.slotAssignments[slotName].reduce((acc, vnode) => {
+            // If the passed slot content is factory, evaluate it and use the produced vnodes
+            if (vnode && isVScopedSlotFragment(vnode)) {
+                const vmBeingRenderedInception = getVMBeingRendered();
+                let children = [];
+                // Evaluate in the scope of the slot content's owner
+                // if a slotset is provided, there will always be an owner. The only case where owner is
+                // undefined is for root components, but root components cannot accept slotted content
+                setVMBeingRendered(slotset.owner);
+                try {
+                    children = vnode.factory(data.slotData);
+                }
+                finally {
+                    setVMBeingRendered(vmBeingRenderedInception);
+                }
+                return shared.ArrayConcat.call(acc, children);
+            }
+            else {
+                // If the slot content is a static list of child nodes provided by the parent, nothing to do
+                return shared.ArrayConcat.call(acc, vnode);
+            }
+        }, []);
     }
     const vmBeingRendered = getVMBeingRendered();
     const { renderMode, shadowMode } = vmBeingRendered;
@@ -4754,6 +4799,7 @@ const api = shared.freeze({
     gid,
     fid,
     shc,
+    ssf,
 });
 
 /*
@@ -4890,9 +4936,9 @@ function validateSlots(vm, html) {
     }
     const { cmpSlots } = vm;
     const { slots = EmptyArray } = html;
-    for (const slotName in cmpSlots) {
+    for (const slotName in cmpSlots.slotAssignments) {
         // eslint-disable-next-line @lwc/lwc-internal/no-production-assert
-        shared.assert.isTrue(shared.isArray(cmpSlots[slotName]), `Slots can only be set to an array, instead received ${shared.toString(cmpSlots[slotName])} for slot "${slotName}" in ${vm}.`);
+        shared.assert.isTrue(shared.isArray(cmpSlots.slotAssignments[slotName]), `Slots can only be set to an array, instead received ${shared.toString(cmpSlots.slotAssignments[slotName])} for slot "${slotName}" in ${vm}.`);
         if (slotName !== '' && shared.ArrayIndexOf.call(slots, slotName) === -1) {
             // TODO [#1297]: this should never really happen because the compiler should always validate
             // eslint-disable-next-line @lwc/lwc-internal/no-production-assert
@@ -5389,7 +5435,9 @@ function createVM(elm, ctor, renderer, options) {
     velements: EmptyArray,
     cmpProps: shared.create(null),
     cmpFields: shared.create(null),
-    cmpSlots: shared.create(null),
+    cmpSlots: {
+      slotAssignments: shared.create(null)
+    },
     oar: shared.create(null),
     cmpTemplate: null,
     hydrated: Boolean(hydrated),
@@ -6840,4 +6888,4 @@ exports.swapTemplate = swapTemplate;
 exports.track = track;
 exports.unwrap = unwrap;
 exports.wire = wire;
-/* version: 2.26.0 */
+/* version: 2.27.0 */

package/dist/engine-core.js

@@ -1,7 +1,7 @@
 /* proxy-compat-disable */
 import { lwcRuntimeFlags } from '@lwc/features';
 export { setFeatureFlag, setFeatureFlagForTest } from '@lwc/features';
-import { seal, create, isUndefined as isUndefined$1, isFunction as isFunction$1, ArrayPush as ArrayPush$1, ArrayIndexOf, ArraySplice, StringToLowerCase, isNull, ArrayJoin, isFrozen, defineProperty, hasOwnProperty as hasOwnProperty$1, assign, forEach, keys, AriaPropNameToAttrNameMap, getPropertyDescriptor, defineProperties, getOwnPropertyNames as getOwnPropertyNames$1, getPrototypeOf as getPrototypeOf$1, setPrototypeOf, isObject, freeze, assert, KEY__SYNTHETIC_MODE, isFalse, isTrue, toString as toString$1, getOwnPropertyDescriptor as getOwnPropertyDescriptor$1, LWC_VERSION_COMMENT_REGEX, LWC_VERSION, htmlPropertyToAttribute, ArraySlice, ArrayMap, isArray as isArray$1, KEY__SCOPED_CSS, StringCharCodeAt, XML_NAMESPACE, XLINK_NAMESPACE, isString, StringSlice, SVG_NAMESPACE, KEY__SHADOW_STATIC, KEY__SHADOW_RESOLVER, isNumber, StringReplace, noop, ArrayUnshift, ArrayFilter, ArrayCopyWithin, ArrayFill, ArraySort, ArrayReverse, ArrayShift, ArrayPop } from '@lwc/shared';
+import { seal, create, isUndefined as isUndefined$1, isFunction as isFunction$1, ArrayPush as ArrayPush$1, ArrayIndexOf, ArraySplice, StringToLowerCase, isNull, ArrayJoin, isFrozen, defineProperty, hasOwnProperty as hasOwnProperty$1, assign, forEach, keys, AriaPropNameToAttrNameMap, getPropertyDescriptor, defineProperties, getOwnPropertyNames as getOwnPropertyNames$1, getPrototypeOf as getPrototypeOf$1, setPrototypeOf, isObject, freeze, assert, KEY__SYNTHETIC_MODE, isFalse, isTrue, toString as toString$1, getOwnPropertyDescriptor as getOwnPropertyDescriptor$1, LWC_VERSION_COMMENT_REGEX, LWC_VERSION, htmlPropertyToAttribute, ArraySlice, ArrayMap, isArray as isArray$1, KEY__SCOPED_CSS, StringCharCodeAt, XML_NAMESPACE, XLINK_NAMESPACE, isString, StringSlice, SVG_NAMESPACE, KEY__SHADOW_STATIC, KEY__SHADOW_RESOLVER, ArrayConcat as ArrayConcat$1, isNumber, StringReplace, noop, ArrayUnshift, ArrayFilter, ArrayCopyWithin, ArrayFill, ArraySort, ArrayReverse, ArrayShift, ArrayPop } from '@lwc/shared';
 
 /*
  * Copyright (c) 2018, salesforce.com, inc.
@@ -3226,6 +3226,9 @@ function isSameVnode(vnode1, vnode2) {
 function isVCustomElement(vnode) {
     return vnode.type === 3 /* VNodeType.CustomElement */;
 }
+function isVScopedSlotFragment(vnode) {
+    return vnode.type === 6 /* VNodeType.ScopedSlotFragment */;
+}
 
 /*
  * Copyright (c) 2018, salesforce.com, inc.
@@ -4064,7 +4067,7 @@ function allocateChildren(vnode, vm) {
   /* RenderMode.Light */
   ) {
     // slow path
-    allocateInSlot(vm, children); // save the allocated children in case this vnode is reused.
+    allocateInSlot(vm, children, vnode.owner); // save the allocated children in case this vnode is reused.
 
     vnode.aChildren = children; // every child vnode is now allocated, and the host should receive none directly, it receives them via the shadow!
 
@@ -4100,13 +4103,19 @@ function createViewModelHook(elm, vnode, renderer) {
   return vm;
 }
 
-function allocateInSlot(vm, children) {
-  var _a;
+function allocateInSlot(vm, children, owner) {
+  var _a, _b;
 
   const {
-    cmpSlots: oldSlots
+    cmpSlots: {
+      slotAssignments: oldSlotsMapping
+    }
   } = vm;
-  const cmpSlots = vm.cmpSlots = create(null);
+  const cmpSlotsMapping = create(null);
+  vm.cmpSlots = {
+    owner,
+    slotAssignments: cmpSlotsMapping
+  };
 
   for (let i = 0, len = children.length; i < len; i += 1) {
     const vnode = children[i];
@@ -4118,19 +4127,21 @@ function allocateInSlot(vm, children) {
     let slotName = '';
 
     if (isVBaseElement(vnode)) {
-      slotName = ((_a = vnode.data.attrs) === null || _a === void 0 ? void 0 : _a.slot) || '';
+      slotName = (_b = (_a = vnode.data.attrs) === null || _a === void 0 ? void 0 : _a.slot) !== null && _b !== void 0 ? _b : '';
+    } else if (isVScopedSlotFragment(vnode)) {
+      slotName = vnode.slotName;
     }
 
-    const vnodes = cmpSlots[slotName] = cmpSlots[slotName] || [];
+    const vnodes = cmpSlotsMapping[slotName] = cmpSlotsMapping[slotName] || [];
     ArrayPush$1.call(vnodes, vnode);
   }
 
   if (isFalse(vm.isDirty)) {
     // We need to determine if the old allocation is really different from the new one
     // and mark the vm as dirty
-    const oldKeys = keys(oldSlots);
+    const oldKeys = keys(oldSlotsMapping);
 
-    if (oldKeys.length !== keys(cmpSlots).length) {
+    if (oldKeys.length !== keys(cmpSlotsMapping).length) {
       markComponentAsDirty(vm);
       return;
     }
@@ -4138,15 +4149,15 @@ function allocateInSlot(vm, children) {
     for (let i = 0, len = oldKeys.length; i < len; i += 1) {
       const key = oldKeys[i];
 
-      if (isUndefined$1(cmpSlots[key]) || oldSlots[key].length !== cmpSlots[key].length) {
+      if (isUndefined$1(cmpSlotsMapping[key]) || oldSlotsMapping[key].length !== cmpSlotsMapping[key].length) {
         markComponentAsDirty(vm);
         return;
       }
 
-      const oldVNodes = oldSlots[key];
-      const vnodes = cmpSlots[key];
+      const oldVNodes = oldSlotsMapping[key];
+      const vnodes = cmpSlotsMapping[key];
 
-      for (let j = 0, a = cmpSlots[key].length; j < a; j += 1) {
+      for (let j = 0, a = cmpSlotsMapping[key].length; j < a; j += 1) {
         if (oldVNodes[j] !== vnodes[j]) {
           markComponentAsDirty(vm);
           return;
@@ -4346,6 +4357,18 @@ const SymbolIterator = Symbol.iterator;
 function addVNodeToChildLWC(vnode) {
     ArrayPush$1.call(getVMBeingRendered().velements, vnode);
 }
+// [s]coped [s]lot [f]actory
+function ssf(slotName, factory) {
+    return {
+        type: 6 /* VNodeType.ScopedSlotFragment */,
+        factory,
+        owner: getVMBeingRendered(),
+        elm: undefined,
+        sel: undefined,
+        key: undefined,
+        slotName,
+    };
+}
 // [st]atic node
 function st(fragment, key) {
     return {
@@ -4429,9 +4452,31 @@ function s(slotName, data, children, slotset) {
         assert.isTrue(isArray$1(children), `h() 3rd argument children must be an array.`);
     }
     if (!isUndefined$1(slotset) &&
-        !isUndefined$1(slotset[slotName]) &&
-        slotset[slotName].length !== 0) {
-        children = slotset[slotName];
+        !isUndefined$1(slotset.slotAssignments) &&
+        !isUndefined$1(slotset.slotAssignments[slotName]) &&
+        slotset.slotAssignments[slotName].length !== 0) {
+        children = slotset.slotAssignments[slotName].reduce((acc, vnode) => {
+            // If the passed slot content is factory, evaluate it and use the produced vnodes
+            if (vnode && isVScopedSlotFragment(vnode)) {
+                const vmBeingRenderedInception = getVMBeingRendered();
+                let children = [];
+                // Evaluate in the scope of the slot content's owner
+                // if a slotset is provided, there will always be an owner. The only case where owner is
+                // undefined is for root components, but root components cannot accept slotted content
+                setVMBeingRendered(slotset.owner);
+                try {
+                    children = vnode.factory(data.slotData);
+                }
+                finally {
+                    setVMBeingRendered(vmBeingRenderedInception);
+                }
+                return ArrayConcat$1.call(acc, children);
+            }
+            else {
+                // If the slot content is a static list of child nodes provided by the parent, nothing to do
+                return ArrayConcat$1.call(acc, vnode);
+            }
+        }, []);
     }
     const vmBeingRendered = getVMBeingRendered();
     const { renderMode, shadowMode } = vmBeingRendered;
@@ -4751,6 +4796,7 @@ const api = freeze({
     gid,
     fid,
     shc,
+    ssf,
 });
 
 /*
@@ -4887,9 +4933,9 @@ function validateSlots(vm, html) {
     }
     const { cmpSlots } = vm;
     const { slots = EmptyArray } = html;
-    for (const slotName in cmpSlots) {
+    for (const slotName in cmpSlots.slotAssignments) {
         // eslint-disable-next-line @lwc/lwc-internal/no-production-assert
-        assert.isTrue(isArray$1(cmpSlots[slotName]), `Slots can only be set to an array, instead received ${toString$1(cmpSlots[slotName])} for slot "${slotName}" in ${vm}.`);
+        assert.isTrue(isArray$1(cmpSlots.slotAssignments[slotName]), `Slots can only be set to an array, instead received ${toString$1(cmpSlots.slotAssignments[slotName])} for slot "${slotName}" in ${vm}.`);
         if (slotName !== '' && ArrayIndexOf.call(slots, slotName) === -1) {
             // TODO [#1297]: this should never really happen because the compiler should always validate
             // eslint-disable-next-line @lwc/lwc-internal/no-production-assert
@@ -5386,7 +5432,9 @@ function createVM(elm, ctor, renderer, options) {
     velements: EmptyArray,
     cmpProps: create(null),
     cmpFields: create(null),
-    cmpSlots: create(null),
+    cmpSlots: {
+      slotAssignments: create(null)
+    },
     oar: create(null),
     cmpTemplate: null,
     hydrated: Boolean(hydrated),
@@ -6801,4 +6849,4 @@ function getComponentConstructor(elm) {
 }
 
 export { LightningElement, profilerControl as __unstable__ProfilerControl, api$1 as api, connectRootElement, createContextProvider, createVM, disconnectRootElement, freezeTemplate, getAssociatedVMIfPresent, getComponentConstructor, getComponentDef, getComponentHtmlPrototype, hydrateRoot, isComponentConstructor, parseFragment, parseSVGFragment, readonly, register, registerComponent, registerDecorators, registerTemplate, sanitizeAttribute, setHooks, swapComponent, swapStyle, swapTemplate, track, unwrap, wire };
-/* version: 2.26.0 */
+/* version: 2.27.0 */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@lwc/engine-core",
-    "version": "2.26.0",
+    "version": "2.27.0",
     "description": "Core LWC engine APIs.",
     "homepage": "https://lwc.dev/",
     "repository": {
@@ -24,8 +24,8 @@
         "types/"
     ],
     "dependencies": {
-        "@lwc/features": "2.26.0",
-        "@lwc/shared": "2.26.0"
+        "@lwc/features": "2.27.0",
+        "@lwc/shared": "2.27.0"
     },
     "devDependencies": {
         "observable-membrane": "2.0.0"

package/types/framework/api.d.ts

@@ -1,6 +1,7 @@
 import { SlotSet } from './vm';
 import { LightningElementConstructor } from './base-lightning-element';
-import { VNode, VNodes, VElement, VText, VCustomElement, VComment, VElementData, VStatic, Key, VFragment } from './vnodes';
+import { VNode, VNodes, VElement, VText, VCustomElement, VComment, VElementData, VStatic, Key, VFragment, VScopedSlotFragment } from './vnodes';
+declare function ssf(slotName: string, factory: (value: any) => VNodes): VScopedSlotFragment;
 declare function st(fragment: Element, key: Key): VStatic;
 declare function fr(key: Key, children: VNodes, stable: 0 | 1): VFragment;
 declare function h(sel: string, data: VElementData, children?: VNodes): VElement;
@@ -47,6 +48,7 @@ declare const api: Readonly<{
     gid: typeof gid;
     fid: typeof fid;
     shc: typeof shc;
+    ssf: typeof ssf;
 }>;
 export default api;
 export declare type RenderAPI = typeof api;

package/types/framework/vm.d.ts

@@ -10,7 +10,10 @@ export interface TemplateCache {
     [key: string]: any;
 }
 export interface SlotSet {
-    [key: string]: VNodes;
+    slotAssignments: {
+        [key: string]: VNodes;
+    };
+    owner?: VM;
 }
 export declare const enum VMState {
     created = 0,
@@ -91,7 +94,8 @@ export interface VM<N = HostNode, E = HostElement> {
     cmpProps: {
         [name: string]: any;
     };
-    /** The mapping between the slot names and the slotted VNodes. */
+    /** Contains information about the mapping between the slot names and the slotted VNodes, and
+     *  the owner of the slot content. */
     cmpSlots: SlotSet;
     /** The component internal reactive properties. */
     cmpFields: {

package/types/framework/vnodes.d.ts

@@ -7,9 +7,10 @@ export declare const enum VNodeType {
     Element = 2,
     CustomElement = 3,
     Static = 4,
-    Fragment = 5
+    Fragment = 5,
+    ScopedSlotFragment = 6
 }
-export declare type VNode = VText | VComment | VElement | VCustomElement | VStatic | VFragment;
+export declare type VNode = VText | VComment | VElement | VCustomElement | VStatic | VFragment | VScopedSlotFragment;
 export declare type VParentElement = VElement | VCustomElement | VFragment;
 export declare type VNodes = Readonly<Array<VNode | null>>;
 export interface BaseVParent {
@@ -22,6 +23,11 @@ export interface BaseVNode {
     key: Key | undefined;
     owner: VM;
 }
+export interface VScopedSlotFragment extends BaseVNode {
+    factory: (value: any) => VNodes;
+    type: VNodeType.ScopedSlotFragment;
+    slotName: string;
+}
 export interface VStatic extends BaseVNode {
     type: VNodeType.Static;
     sel: undefined;
@@ -77,7 +83,9 @@ export interface VNodeData {
 export interface VElementData extends VNodeData {
     readonly key: Key;
     readonly ref?: string;
+    readonly slotData?: any;
 }
 export declare function isVBaseElement(vnode: VNode): vnode is VElement | VCustomElement;
 export declare function isSameVnode(vnode1: VNode, vnode2: VNode): boolean;
 export declare function isVCustomElement(vnode: VBaseElement): vnode is VCustomElement;
+export declare function isVScopedSlotFragment(vnode: VNode): vnode is VScopedSlotFragment;