anu-verzum 2.3.0 → 2.3.2

package/dist/core/components/AnulyticsProvider.d.ts

@@ -1,5 +1,5 @@
 import { Component } from './Component';
-import { AnuElement, Props } from '../elements';
+import { AnuChild, Props } from '../elements';
 type UserActionEvent = {
     type: string;
     keyCode?: number | null;
@@ -26,7 +26,7 @@ declare class AnulyticsProvider extends Component<AnulyticsProviderProps> {
     componentDidMount(): void;
     componentWillUnmount(): void;
     handleVisibilityChange(): void;
-    render(): AnuElement | AnuElement[] | null;
+    render(): AnuChild[] | null;
 }
 export default AnulyticsProvider;
 export declare const __testing: {

package/dist/core/components/AnulyticsProvider.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.trackStateChange = exports.trackRouteChange = exports.trackEvent = exports.default = exports.__testing = void 0;
 var _Component = require("./Component");
+var _elements = require("../elements");
 var _serverApi = _interopRequireDefault(require("../../server-api/server-api"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const EventTypes = {
@@ -206,9 +207,9 @@ class AnulyticsProvider extends _Component.Component {
     }
   }
   render() {
-    const children = this.props.children;
+    const children = (0, _elements.toChildArray)(this.props.children);
     try {
-      if (!children || children.length !== 1) {
+      if (children.length !== 1) {
         throw new Error('Provider must have one child element!');
       }
       return children;

package/dist/core/components/Component.d.ts

@@ -1,4 +1,4 @@
-import { AnuElement, Props } from '../elements';
+import { AnuNode, Props } from '../elements';
 export declare abstract class Component<P extends Record<string, any> = Props, S extends Record<string, any> = Record<string, any>> {
     props: P;
     state: S;
@@ -7,7 +7,7 @@ export declare abstract class Component<P extends Record<string, any> = Props, S
     static isAnuComponent: boolean;
     constructor(props: P, context?: Record<string, any>);
     setState(partialState?: Partial<S> | ((prevState: S, prevProps: P) => Partial<S>)): void;
-    abstract render(): AnuElement | AnuElement[] | string | number | boolean | null | undefined;
+    abstract render(): AnuNode;
     componentDidMount(): void;
     componentDidUpdate(_prevProps: P, _prevState: S): void;
     componentWillUnmount(): void;

package/dist/core/components/Connector.d.ts

@@ -1,5 +1,5 @@
 import { Component } from './Component';
-import { AnuElement, Props, ComponentConstructor } from '../elements';
+import { AnuChild, Props, ComponentConstructor } from '../elements';
 type StoreShape = {
     getState: () => any;
     dispatch: (action: any) => any;
@@ -14,7 +14,7 @@ export interface ConnectorProviderProps extends Props {
 declare class Provider extends Component<ConnectorProviderProps> {
     store: StoreShape;
     constructor(props: ConnectorProviderProps, context?: Record<string, any>);
-    render(): AnuElement | AnuElement[] | null;
+    render(): AnuChild[] | null;
 }
 declare const Connector: {
     connect: <TState = any, TOwnProps extends Record<string, any> = Record<string, any>, TStateProps extends Record<string, any> = Record<string, any>, TDispatchProps extends Record<string, any> = Record<string, any>>(mapStateToProps?: MapStateToProps<TState, TOwnProps, TStateProps> | null, mapDispatchToProps?: MapDispatchToProps<any, TOwnProps, TDispatchProps> | null) => (WrappedComponent: ComponentConstructor<TStateProps & TDispatchProps & TOwnProps>) => ComponentConstructor;

package/dist/core/components/Connector.js

@@ -40,9 +40,9 @@ class Provider extends _Component.Component {
     });
   }
   render() {
-    const children = this.props.children;
+    const children = (0, _elements.toChildArray)(this.props.children);
     try {
-      if (!children || children.length !== 1) {
+      if (children.length !== 1) {
         throw new Error('Provider must have one child element!');
       }
       return children;

package/dist/core/components/Context.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.createContext = void 0;
 var _utils = require("../../misc/utils");
 var _Component = require("./Component");
+var _elements = require("../elements");
 const createContext = context => {
   const defaultContext = {
     value: context
@@ -37,9 +38,9 @@ const createContext = context => {
       }
     }
     render() {
-      const children = this.props.children;
+      const children = (0, _elements.toChildArray)(this.props.children);
       try {
-        if (!children || children.length !== 1) {
+        if (children.length !== 1) {
           throw new Error('Context Component must have exactly one child element!');
         }
         return children;
@@ -80,23 +81,21 @@ const createContext = context => {
       }
     }
     render() {
-      const children = this.props.children;
+      const children = (0, _elements.toChildArray)(this.props.children);
       try {
-        if (!children || children.length !== 1) {
+        if (children.length !== 1) {
           throw new Error('Context Component must have exactly one child element!');
         }
         const provider = resolveProvider(this);
         this.subscribeTo(provider);
         const value = provider ? provider.value : defaultContext.value;
-        const {
-          type
-        } = children[0];
+        const renderChild = children[0];
         const childProps = {
           value,
           defaultContext
         };
-        if (typeof type === 'function') {
-          return type(childProps);
+        if (typeof renderChild === 'function') {
+          return renderChild(childProps);
         } else {
           throw new Error('Context component child element must be a function!');
         }

package/dist/core/components/Feature.js

@@ -12,7 +12,7 @@ const defaultFeatures = {};
 const FeaturesContext = (0, _Context.createContext)(defaultFeatures);
 const resolveDefault = defaultComponent => {
   if (defaultComponent && !Array.isArray(defaultComponent) && defaultComponent.type === _Fragment.Fragment) {
-    return defaultComponent.props.children ?? null;
+    return (0, _elements.toChildArray)(defaultComponent.props.children);
   }
   return defaultComponent;
 };

package/dist/core/components/Fragment.d.ts

@@ -1,5 +1,5 @@
 import { Component } from './Component';
-import { AnuElement } from '../elements';
+import { AnuChild } from '../elements';
 export declare class Fragment extends Component {
-    render(): AnuElement[];
+    render(): AnuChild[];
 }

package/dist/core/components/Fragment.js

@@ -5,11 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Fragment = void 0;
 var _Component = require("./Component");
+var _elements = require("../elements");
 class Fragment extends _Component.Component {
   render() {
-    const children = this.props.children;
+    const children = (0, _elements.toChildArray)(this.props.children);
     try {
-      if (!children || !children.length) {
+      if (!children.length) {
         throw new Error('Fragment must have at least one child element!');
       }
       return children;

package/dist/core/elements.d.ts

@@ -22,3 +22,5 @@ export type AnuElement<P = Props, T extends ElementType = ElementType> = {
     ref: Ref<any> | null;
 };
 export declare const createElement: (type: ElementType, config: Props | null, ...args: any[]) => AnuElement;
+export declare const toChildArray: (children: AnuNode) => AnuChild[];
+export declare const normalizeChildren: (children: AnuNode) => AnuElement[];

package/dist/core/elements.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createElement = exports.TEXT_ELEMENT = exports.PORTAL_ELEMENT = void 0;
+exports.toChildArray = exports.normalizeChildren = exports.createElement = exports.TEXT_ELEMENT = exports.PORTAL_ELEMENT = void 0;
 const TEXT_ELEMENT = exports.TEXT_ELEMENT = 'TEXT_ELEMENT';
 const PORTAL_ELEMENT = exports.PORTAL_ELEMENT = Symbol('portal');
 const createTextElement = value => ({
@@ -20,13 +20,10 @@ const createElement = (type, config, ...args) => {
   const props = Object.assign({}, config);
   delete props.key;
   delete props.ref;
-  if (args.length > 0) {
-    const rawChildren = [].concat(...args);
-    props.children = rawChildren.filter(c => c !== null && c !== undefined && typeof c !== 'boolean').map(c => typeof c === 'function' ? createElement(c, {
-      ...(c.props || {})
-    }) : c instanceof Object ? c : createTextElement(c));
-  } else {
-    props.children = props.children ?? [];
+  if (args.length === 1) {
+    props.children = args[0];
+  } else if (args.length > 1) {
+    props.children = args;
   }
   return {
     type,
@@ -35,4 +32,20 @@ const createElement = (type, config, ...args) => {
     ref
   };
 };
-exports.createElement = createElement;
+exports.createElement = createElement;
+const flattenChildren = (children, acc = []) => {
+  if (Array.isArray(children)) {
+    for (const child of children) {
+      flattenChildren(child, acc);
+    }
+  } else if (children !== null && children !== undefined && typeof children !== 'boolean') {
+    acc.push(children);
+  }
+  return acc;
+};
+const toChildArray = children => flattenChildren(children);
+exports.toChildArray = toChildArray;
+const normalizeChildren = children => flattenChildren(children).map(c => typeof c === 'function' ? createElement(c, {
+  ...(c.props || {})
+}) : c instanceof Object ? c : createTextElement(c));
+exports.normalizeChildren = normalizeChildren;

package/dist/core/reconciler.js

@@ -204,7 +204,6 @@ const updateClassComponent = wipFiber => {
   const newChildElements = wipFiber.stateNode.render();
   reconcileChildrenArray(wipFiber, newChildElements);
 };
-const arrify = val => !val ? [] : Array.isArray(val) ? val : [val];
 const getTag = element => {
   if (element.type === _elements.PORTAL_ELEMENT) {
     return PORTAL;
@@ -218,7 +217,7 @@ const getTag = element => {
   return CLASS_COMPONENT;
 };
 const reconcileChildrenArray = (wipFiber, newChildElements) => {
-  const elements = arrify(newChildElements);
+  const elements = (0, _elements.normalizeChildren)(newChildElements);
   const oldFiberMap = new Map();
   let oldFiber = wipFiber.alternate ? wipFiber.alternate.child : undefined;
   let oldIndex = 0;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import Utils from './misc/utils';
 import ServerAPI from './server-api/server-api';
-import { createElement, AnuElement, Props, Ref } from './core/elements';
+import { createElement, AnuElement, AnuNode, Props, Ref } from './core/elements';
 import { createRef, render, createPortal } from './core/reconciler';
 import store from './store/store';
 import { createContext } from './core/components/Context';
@@ -29,7 +29,7 @@ declare const Anu: {
     };
     createContext: <T extends Record<string, any> = Record<string, any>>(context: T) => import("./core/components/Context").Context<T>;
     createElement: (type: import(".").ElementType, config: Props | null, ...args: any[]) => AnuElement;
-    createPortal: (children: import(".").AnuNode, container: Element) => AnuElement;
+    createPortal: (children: AnuNode, container: Element) => AnuElement;
     createRef: <T = any>() => Ref<T>;
     Component: typeof Component;
     Fragment: typeof Fragment;
@@ -118,7 +118,7 @@ declare const Anu: {
                     subscribe: (listener: () => void) => void;
                     unsubscribe: (listener: () => void) => void;
                 };
-                render(): AnuElement | AnuElement[] | null;
+                render(): import(".").AnuChild[] | null;
                 props: import("./core/components/Connector").ConnectorProviderProps;
                 state: Record<string, any>;
                 context: Record<string, any>;
@@ -172,7 +172,7 @@ declare global {
         interface Element extends AnuElement<any, any> {
         }
         interface ElementClass {
-            render(): AnuElement | AnuElement[] | string | number | boolean | null | undefined;
+            render(): AnuNode;
         }
         interface ElementAttributesProperty {
             props: Record<string, unknown>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anu-verzum",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "A \"React-like\" UI library that supports JSX syntax, Redux-like state management, array-rendering, i18n, routing and many more.",
   "keywords": [
     "anu-verzum",