Speedup 3 1

CHANGELOG.md

@@ -63,6 +63,12 @@ _Note: Gaps between patch versions are faulty, broken or test releases._
     This decorator is automatically added during the build process.
   * Optimized creation of metaobjects.
 
+## v4.0.0-beta.152 (2024-11-11)
+
+#### :rocket: New Feature
+
+* Added `trackContentSwipes` - a flag to prevent unexpected closure of a component instance `bBottomSlide`
+
 ## v4.0.0-beta.151 (2024-11-06)
 
 #### :bug: Bug Fix

build/graph/component-params.js

@@ -12,8 +12,7 @@ const
 	$C = require('collection.js'),
 	escaper = require('escaper');
 
-const
-	fs = require('node:fs');
+const fs = require('node:fs');
 
 const {
 	componentRgxp,
@@ -67,8 +66,7 @@ Object.assign(componentParams, {
  * Load component runtime parameters to a map
  */
 componentFiles.forEach((el) => {
-	const
-		escapedFragments = [];
+	const escapedFragments = [];
 
 	const
 		file = escaper.replace(fs.readFileSync(el).toString(), escapedFragments),
@@ -94,8 +92,7 @@ componentFiles.forEach((el) => {
 		parent
 	};
 
-	const
-		obj = componentParams[component];
+	const obj = componentParams[component];
 
 	obj.deprecatedProps = p.deprecatedProps ?? {};
 

build/snakeskin/default-filters.js

@@ -204,8 +204,8 @@ function tagFilter({name: tag, attrs = {}}, _, rootTag, forceRenderAsVNode, tplN
 		attrs[':componentIdProp'] = [`componentId + ${JSON.stringify(id)}`];
 	}
 
-	if (component.inheritMods !== false && !attrs[':mods'] && !attrs[':modsProp']) {
-		attrs[':mods'] = ['provide.mods()'];
+	if (component.inheritMods !== false) {
+		attrs[':inheritMods'] = ['sharedMods != null'];
 	}
 
 	Object.entries(attrs).forEach(([name, val]) => {

src/components/base/b-dynamic-page/b-dynamic-page.ts

@@ -325,7 +325,6 @@ export default class bDynamicPage extends iDynamicPage {
 		if (passedProps != null) {
 			const rejectedProps = {
 				is: true,
-				keepAlive: true,
 				dispatching: true,
 				componentIdProp: true,
 				getRoot: true,
@@ -334,7 +333,7 @@ export default class bDynamicPage extends iDynamicPage {
 			};
 
 			Object.entries(passedProps).forEach(([propName, prop]) => {
-				if (rejectedProps.hasOwnProperty(propName)) {
+				if (rejectedProps.hasOwnProperty(propName) || this.meta.props.hasOwnProperty(propName)) {
 					return;
 				}
 

src/components/friends/block/README.md

@@ -233,7 +233,7 @@ To disable modifier inheritance, pass the `inheridMods: false` option when creat
 ```typescript
 import iBlock, { component } from 'components/super/i-block/i-block';
 
-@component({inheritMods: false})
+@component()
 class bExample extends iBlock {}
 ```
 
@@ -246,7 +246,7 @@ Please note that the key must be in a dash style, i.e., normalized.
 ```typescript
 import iBlock, { component, ModsDecl } from 'components/super/i-block/i-block';
 
-@component({inheritMods: false})
+@component()
 class bExample extends iBlock {
   static mods: ModsDecl = {
     theme: [
@@ -266,7 +266,7 @@ This property can be observed using the watch API.
 ```typescript
 import iBlock, { component, ModsDecl } from 'components/super/i-block/i-block';
 
-@component({inheritMods: false})
+@component()
 class bExample extends iBlock {
   static mods: ModsDecl = {
     theme: [
@@ -310,7 +310,7 @@ To set a new modifier value or remove an old one, you must use the `setMod` and
 ```typescript
 import iBlock, { component, ModsDecl } from 'components/super/i-block/i-block';
 
-@component({inheritMods: false})
+@component()
 class bExample extends iBlock {
   static mods: ModsDecl = {
     theme: [
@@ -343,7 +343,7 @@ inside and outside the component.
 ```typescript
 import iBlock, { component, ModsDecl } from 'components/super/i-block/i-block';
 
-@component({inheritMods: false})
+@component()
 class bExample extends iBlock {
   static mods: ModsDecl = {
     theme: [
@@ -380,7 +380,7 @@ this can be more convenient than handling each event individually.
 ```typescript
 import iBlock, { component, ModsDecl } from 'components/super/i-block/i-block';
 
-@component({inheritMods: false})
+@component()
 class bExample extends iBlock {
   static mods: ModsDecl = {
     theme: [
@@ -427,7 +427,7 @@ __b-example.ts__
 ```typescript
 import iBlock, { component, ModsDecl } from 'components/super/i-block/i-block';
 
-@component({inheritMods: false})
+@component()
 class bExample extends iBlock {
   mounted() {
     const

src/components/friends/field/delete.ts

@@ -164,26 +164,26 @@ export function deleteField(
 		prop = keyGetter ? <PropertyKey>keyGetter(chunks[0], ref) : chunks[0];
 
 	if (chunks.length > 1) {
-		chunks.some((chunk, i) => {
+		for (let i = 0; i < chunks.length; i++) {
+			const chunk = chunks[i];
+
 			prop = keyGetter ? <PropertyKey>keyGetter(chunk, ref) : chunk;
 
 			if (i + 1 === chunks.length) {
-				return true;
+				break;
 			}
 
 			const newRef = Object.isMap(ref) ? ref.get(prop) : ref[prop];
 
 			if (newRef == null || typeof newRef !== 'object') {
 				needDelete = false;
-				return true;
+				break;
 			}
 
 			ref = newRef;
-			return false;
-		});
+		}
 	}
 
-	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 	if (needDelete) {
 		if (needDeleteToWatch) {
 			ctx.$delete(ref, prop);

src/components/friends/field/get.ts

@@ -149,9 +149,11 @@ export function getField<T = unknown>(
 		}
 
 	} else {
-		const hasNoProperty = chunks.some((chunk) => {
+		for (let i = 0; i < chunks.length; i++) {
+			const chunk = chunks[i];
+
 			if (res == null) {
-				return true;
+				return undefined;
 			}
 
 			if (Object.isPromiseLike(res) && !(chunk in res)) {
@@ -186,12 +188,6 @@ export function getField<T = unknown>(
 					res = typeof obj !== 'object' || chunk in obj ? obj[chunk] : undefined;
 				}
 			}
-
-			return false;
-		});
-
-		if (hasNoProperty) {
-			return undefined;
 		}
 	}
 

src/components/friends/field/set.ts

@@ -165,11 +165,13 @@ export function setField<T = unknown>(
 	let prop = keyGetter ? <PropertyKey>keyGetter(chunks[0], ref) : chunks[0];
 
 	if (chunks.length > 1) {
-		chunks.some((chunk, i) => {
+		for (let i = 0; i < chunks.length; i++) {
+			const chunk = chunks[i];
+
 			prop = keyGetter ? <PropertyKey>keyGetter(chunk, ref) : chunk;
 
 			if (i + 1 === chunks.length) {
-				return true;
+				break;
 			}
 
 			type AnyMap = Map<any, any>;
@@ -198,9 +200,7 @@ export function setField<T = unknown>(
 			} else {
 				ref = ref[prop];
 			}
-
-			return false;
-		});
+		}
 	}
 
 	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition

src/components/friends/provide/mods.ts

@@ -33,24 +33,20 @@ import type { Mods } from 'components/friends/provide/interface';
  * ```
  */
 export function mods(this: Friend, mods?: Mods): CanNull<ModsDict> {
-	const {sharedMods} = this.ctx;
-
-	if (sharedMods == null && mods == null) {
+	if (mods == null) {
 		return null;
 	}
 
-	const resolvedMods = {...sharedMods};
-
-	if (mods != null) {
-		const modNames = Object.keys(mods);
+	const
+		resolvedMods = {},
+		modNames = Object.keys(mods);
 
-		for (let i = 0; i < modNames.length; i++) {
-			const
-				modName = modNames[i],
-				modVal = mods[modName];
+	for (let i = 0; i < modNames.length; i++) {
+		const
+			modName = modNames[i],
+			modVal = mods[modName];
 
-			resolvedMods[modName.dasherize()] = modVal != null ? String(modVal) : undefined;
-		}
+		resolvedMods[modName.dasherize()] = modVal != null ? String(modVal) : undefined;
 	}
 
 	return resolvedMods;

src/components/friends/provide/test/unit/main.ts

@@ -89,14 +89,9 @@ test.describe('friends/provide', () => {
 	});
 
 	test.describe('`mods`', () => {
-		test('should return a dictionary of active modifiers and their values', async () => {
-			await test.expect(target.evaluate(({provide}) => provide.mods()))
-				.resolves.toEqual({foo: 'bar'});
-		});
-
-		test('should return a dictionary of active and provided modifiers and their values', async () => {
+		test('should return a dictionary of provided modifiers and their values', async () => {
 			await test.expect(target.evaluate(({provide}) => provide.mods({baz: 'bla'})))
-				.resolves.toEqual({foo: 'bar', baz: 'bla'});
+				.resolves.toEqual({baz: 'bla'});
 		});
 	});
 

src/components/super/i-block/i-block.ts

@@ -128,7 +128,7 @@ export default abstract class iBlock extends iBlockProviders {
 			this.watch('$attrs', {deep: true}, mountAttrs);
 		}
 
-		function mountAttrs(attrs: Dictionary<string>) {
+		function mountAttrs(attrs: Dictionary<string | Function>) {
 			const mountedAttrsGroup = {group: 'mountedAttrs'};
 			$a.terminateWorker(mountedAttrsGroup);
 
@@ -137,34 +137,41 @@ export default abstract class iBlock extends iBlockProviders {
 			}
 
 			attrsStore ??= new Set<string>();
-			const mountedAttrs = attrsStore;
 
-			Object.entries(attrs).forEach(([name, attr]) => {
-				if (attr == null) {
-					return;
+			const
+				mountedAttrs = attrsStore,
+				attrNames = Object.keys(attrs);
+
+			for (let i = 0; i < attrNames.length; i++) {
+				const
+					attrName = attrNames[i],
+					attrVal = attrs[attrName];
+
+				if (attrVal == null) {
+					continue;
 				}
 
-				if (name === 'class') {
-					attr.split(/\s+/).forEach((val) => {
-						node.classList.add(val);
-						mountedAttrs.add(`class.${val}`);
-					});
+				if (attrName === 'class') {
+					for (const className of (<string>attrVal).split(/\s+/)) {
+						node.classList.add(className);
+						mountedAttrs.add(`class.${className}`);
+					}
 
-				} else if (originalNode.hasAttribute(name)) {
-					node.setAttribute(name, attr);
-					mountedAttrs.add(name);
+				} else if (originalNode.hasAttribute(attrName)) {
+					node.setAttribute(attrName, attrVal);
+					mountedAttrs.add(attrName);
 				}
-			});
+			}
 
 			$a.worker(() => {
-				mountedAttrs.forEach((attr) => {
-					if (attr.startsWith('class.')) {
-						node.classList.remove(attr.split('.')[1]);
+				for (const attrName of mountedAttrs) {
+					if (attrName.startsWith('class.')) {
+						node.classList.remove(attrName.split('.')[1]);
 
 					} else {
-						node.removeAttribute(attr);
+						node.removeAttribute(attrName);
 					}
-				});
+				}
 
 				mountedAttrs.clear();
 			}, mountedAttrsGroup);