nesquick 1.2.0 → 1.4.0

package/lib/Nesquick.js

@@ -1,4 +1,18 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Nesquick = void 0;
 var Nesquick;
@@ -14,3 +28,4 @@ var Nesquick;
     Nesquick.render = render;
 })(Nesquick || (exports.Nesquick = Nesquick = {}));
 exports.default = Nesquick;
+__exportStar(require("./jsx-runtime"), exports);

package/lib/NesquickComponent.js

@@ -6,6 +6,21 @@ const SVGNamespaces = new Map([
     ["xlink", "http://www.w3.org/1999/xlink"],
     ["xml", "http://www.w3.org/XML/1998/namespace"]
 ]);
+function getAttributeNs(attributes, k) {
+    const index = k.indexOf(":");
+    if (index > -1) {
+        const ns = k.substring(0, index);
+        const name = k.substring(index + 1);
+        const namespace = attributes.get(ns);
+        if (namespace != null) {
+            return {
+                namespace: namespace,
+                name: name
+            };
+        }
+    }
+    return null;
+}
 class NesquickComponent {
     constructor(_render, props) {
         this._render = _render;
@@ -72,21 +87,6 @@ class NesquickComponent {
     setXmlns(xmlns) {
         this._xmlns = xmlns;
     }
-    _getAttributeNs(attributes, k) {
-        const index = k.indexOf(":");
-        if (index > -1) {
-            const ns = k.substring(0, index);
-            const name = k.substring(index + 1);
-            const namespace = attributes.get(ns);
-            if (namespace != null) {
-                return {
-                    namespace: namespace,
-                    name: name
-                };
-            }
-        }
-        return null;
-    }
     _renderPropsNs(attributes, element, props) {
         for (const k in props) {
             if (k !== "children" && k !== "xmlns" && k !== "ref") {
@@ -98,7 +98,7 @@ class NesquickComponent {
                         element[k.toLowerCase()] = props[k];
                     }
                     else {
-                        const attribute = this._getAttributeNs(attributes, k);
+                        const attribute = getAttributeNs(attributes, k);
                         if (attribute) {
                             (0, State_1.useRender)(props[k], v => {
                                 element.setAttributeNS(attribute.namespace, attribute.name, String(v));
@@ -112,7 +112,7 @@ class NesquickComponent {
                     }
                 }
                 else {
-                    const attribute = this._getAttributeNs(attributes, k);
+                    const attribute = getAttributeNs(attributes, k);
                     if (attribute) {
                         element.setAttributeNS(attribute.namespace, attribute.name, String(props[k]));
                     }

package/lib/cli/transformer.js

@@ -1,41 +1,49 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformer = void 0;
+exports.createCheckFunction = createCheckFunction;
 const TS = require("typescript");
 function getSingleIdentifier(node) {
-    const identifiers = [];
+    let identifier = null;
     node.forEachChild(node => {
         if (TS.isIdentifier(node)) {
-            identifiers.push(node);
+            if (identifier != null) {
+                return node;
+            }
+            identifier = node;
         }
     });
-    if (identifiers.length === 1) {
-        return identifiers[0];
-    }
-    return null;
+    return identifier;
 }
 function getSingleBody(node) {
-    const body = [];
+    let body = null;
     node.forEachChild(node => {
-        body.push(node);
+        if (body != null) {
+            return node;
+        }
+        body = node;
     });
-    if (body.length === 1) {
-        return body[0];
-    }
-    return null;
+    return body;
+}
+function createCheckFunction(fName) {
+    return TS.factory.createFunctionDeclaration(void 0, void 0, fName, void 0, [TS.factory.createParameterDeclaration(void 0, void 0, TS.factory.createIdentifier("v"))], void 0, TS.factory.createBlock([
+        TS.factory.createReturnStatement(TS.factory.createConditionalExpression(TS.factory.createBinaryExpression(TS.factory.createTypeOfExpression(TS.factory.createIdentifier("v")), TS.factory.createToken(TS.SyntaxKind.EqualsEqualsEqualsToken), TS.factory.createStringLiteral("function")), TS.factory.createToken(TS.SyntaxKind.QuestionToken), TS.factory.createIdentifier("v"), TS.factory.createToken(TS.SyntaxKind.ColonToken), TS.factory.createArrowFunction(void 0, void 0, [], void 0, TS.factory.createToken(TS.SyntaxKind.EqualsGreaterThanToken), TS.factory.createIdentifier("v"))))
+    ]));
 }
 const transformer = context => {
     return sourceFile => {
+        let hasChecker = false;
+        const checkerName = TS.factory.createUniqueName("_check");
         const visitGeneric = (node, options) => {
             let hasSpread = options.userComponent && TS.isJsxSpreadAttribute(node);
-            let hasChildIdentifier = false;
+            let hasCallExpression = TS.isCallExpression(node);
             if (TS.isJsxOpeningLikeElement(node)) {
                 const firstLetter = node.tagName.getText()[0];
                 const userComponent = firstLetter !== firstLetter.toLowerCase();
                 node = TS.visitEachChild(node, node => {
                     const res = visitGeneric(node, { userComponent });
                     hasSpread = hasSpread || res.hasSpread;
-                    hasChildIdentifier = hasChildIdentifier || res.hasChildIdentifier || TS.isIdentifier(node);
+                    hasCallExpression = hasCallExpression || res.hasCallExpression;
                     return res.node;
                 }, context);
                 if (userComponent && hasSpread) {
@@ -60,85 +68,71 @@ const transformer = context => {
                 node = TS.visitEachChild(node, node => {
                     const res = visitGeneric(node, { ...options, isJsxAttribute: true });
                     hasSpread = hasSpread || res.hasSpread;
-                    hasChildIdentifier = hasChildIdentifier || res.hasChildIdentifier || TS.isIdentifier(node);
+                    hasCallExpression = hasCallExpression || res.hasCallExpression;
                     return res.node;
                 }, context);
             }
             else if (TS.isJsxExpression(node)) {
-                node = TS.visitEachChild(node, node => {
-                    const res = visitorExpression(node, { ...options, isJsxAttribute: false });
-                    hasChildIdentifier = hasChildIdentifier || res.hasChildIdentifier || TS.isIdentifier(node);
-                    return res.node;
-                }, context);
+                node = TS.visitEachChild(node, node => visitorExpression(node, { ...options, isJsxAttribute: false }), context);
             }
             else if (options.isJsxAttribute && TS.isStringLiteral(node)) {
-                const returnNode = TS.visitNode(node, node => {
-                    const res = visitorExpression(node, { ...options, isJsxAttribute: false });
-                    hasChildIdentifier = hasChildIdentifier || res.hasChildIdentifier || TS.isIdentifier(node);
-                    return res.node;
-                }, TS.isExpression);
+                const returnNode = TS.visitNode(node, node => visitorExpression(node, { ...options, isJsxAttribute: false }), TS.isExpression);
                 if (TS.isStringLiteral(returnNode)) {
                     node = returnNode;
                 }
                 else {
-                    node = TS.factory.createJsxExpression(undefined, returnNode);
+                    node = TS.factory.createJsxExpression(void 0, returnNode);
                 }
             }
             else {
                 node = TS.visitEachChild(node, node => {
                     const res = visitGeneric(node, { ...options, isJsxAttribute: false });
                     hasSpread = hasSpread || res.hasSpread;
-                    hasChildIdentifier = hasChildIdentifier || res.hasChildIdentifier || TS.isIdentifier(node);
+                    hasCallExpression = hasCallExpression || res.hasCallExpression;
                     return res.node;
                 }, context);
             }
-            return { hasSpread, hasChildIdentifier, node };
+            return { hasSpread, hasCallExpression, node };
         };
         const visitorExpression = (node, options) => {
-            let hasChildIdentifier = false;
             if (TS.isParenthesizedExpression(node)) {
                 const body = getSingleBody(node);
                 if (body) {
-                    node = TS.visitNode(body, node => {
-                        const res = visitorExpression(node, options);
-                        hasChildIdentifier = hasChildIdentifier || res.hasChildIdentifier || TS.isIdentifier(node);
-                        return res.node;
-                    });
+                    node = body;
                 }
             }
-            else if (TS.isCallExpression(node)) {
-                const identifier = getSingleIdentifier(node);
-                if (identifier) {
+            if (TS.isCallExpression(node)) {
+                let identifier = null;
+                if (node.arguments.length === 0 && (identifier = getSingleIdentifier(node)) != null) {
                     node = identifier;
                 }
                 else {
-                    node = TS.factory.createArrowFunction(undefined, undefined, [], undefined, TS.factory.createToken(TS.SyntaxKind.EqualsGreaterThanToken), TS.visitNode(node, node => {
-                        const res = visitGeneric(node, {});
-                        hasChildIdentifier = hasChildIdentifier || res.hasChildIdentifier || TS.isIdentifier(node);
-                        return res.node;
-                    }, TS.isConciseBody));
-                }
-            }
-            else if (!TS.isFunctionLike(node) && TS.isExpression(node)) {
-                node = TS.visitNode(node, node => {
-                    const res = visitGeneric(node, {});
-                    hasChildIdentifier = hasChildIdentifier || res.hasChildIdentifier;
-                    return res.node;
-                });
-                if ((options.userComponent || hasChildIdentifier) && TS.isConciseBody(node)) {
-                    node = TS.factory.createArrowFunction(undefined, undefined, [], undefined, TS.factory.createToken(TS.SyntaxKind.EqualsGreaterThanToken), node);
+                    node = TS.factory.createArrowFunction(void 0, void 0, [], void 0, TS.factory.createToken(TS.SyntaxKind.EqualsGreaterThanToken), TS.visitNode(node, node => visitGeneric(node, {}).node, TS.isConciseBody));
                 }
             }
             else {
-                node = TS.visitNode(node, node => {
-                    const res = visitGeneric(node, {});
-                    hasChildIdentifier = hasChildIdentifier || res.hasChildIdentifier || TS.isIdentifier(node);
-                    return res.node;
-                });
+                const res = visitGeneric(node, {});
+                node = res.node;
+                if (TS.isExpression(node) && !TS.isFunctionLike(node) && !TS.isJsxElement(node) && !TS.isJsxOpeningLikeElement(node)) {
+                    if (res.hasCallExpression) {
+                        node = TS.factory.createArrowFunction(void 0, void 0, [], void 0, TS.factory.createToken(TS.SyntaxKind.EqualsGreaterThanToken), TS.visitNode(node, node => visitGeneric(node, {}).node, TS.isConciseBody));
+                    }
+                    else if (options.userComponent) {
+                        hasChecker = true;
+                        node = TS.factory.createCallExpression(checkerName, void 0, [node]);
+                    }
+                }
             }
-            return { hasChildIdentifier, node };
+            return node;
         };
-        return TS.visitNode(sourceFile, node => visitGeneric(node, {}).node, TS.isSourceFile);
+        sourceFile = TS.visitNode(sourceFile, node => visitGeneric(node, {}).node, TS.isSourceFile);
+        if (hasChecker) {
+            sourceFile = TS.factory.updateSourceFile(sourceFile, [
+                ...sourceFile.statements,
+                createCheckFunction(checkerName)
+            ]);
+        }
+        return sourceFile;
     };
 };
 exports.transformer = transformer;

package/lib/jsx-runtime.js

@@ -4,16 +4,12 @@ exports.JSX = exports.jsx = exports.Fragment = void 0;
 exports.jsxs = jsxs;
 const NesquickComponent_1 = require("./NesquickComponent");
 const NesquickFragment_1 = require("./NesquickFragment");
-const jsx_runtime_1 = require("./no-transformer/jsx-runtime");
 const propsSpreadSymbol = Symbol.for("$nesquickSpreadProps");
 exports.Fragment = Symbol();
 function jsxs(type, props, key) {
     if (type === exports.Fragment) {
         return new NesquickFragment_1.NesquickFragment(props.children);
     }
-    if (props[propsSpreadSymbol]) {
-        (0, jsx_runtime_1.functionizeProps)(props);
-    }
     if (key !== undefined) {
         props.key = key;
     }

package/lib/types/For/For.d.ts

@@ -1,4 +1,4 @@
-import { Props, JSX } from "../jsx-runtime";
+import { Props, JSX } from "../Nesquick";
 import { NesquickFragment } from "../NesquickFragment";
 type ChildRender<T> = (item: T, i: () => number) => JSX.Element;
 export type ForProps<T> = {

package/lib/types/For/getMap.d.ts

@@ -1,4 +1,4 @@
-import { Props } from "../jsx-runtime";
+import { Props } from "../Nesquick";
 import { ForProps } from "./For";
 export type IdMap<T, ID, CHILD> = {
     getId(item: T, i: number): ID;

package/lib/types/Nesquick.d.ts

@@ -4,3 +4,4 @@ export declare namespace Nesquick {
 }
 export { Children, Child };
 export default Nesquick;
+export * from "./jsx-runtime";

package/lib/types/NesquickComponent.d.ts

@@ -32,7 +32,6 @@ export declare class NesquickComponent<P extends ComponentProps = {}> {
     constructor(_render: string | FunctionComponent<P>, props: P);
     render(document: VeactDocument): Node;
     setXmlns(xmlns: XmlNs | null): void;
-    private _getAttributeNs;
     private _renderPropsNs;
     private _renderProps;
     private _renderStyles;

package/lib/types/NesquickFragment.d.ts

@@ -1,4 +1,4 @@
-import { JSX } from "./jsx-runtime";
+import { JSX } from "./Nesquick";
 import { Child, Children, NesquickComponent, NesquickParent, VeactDocument } from "./NesquickComponent";
 export declare class NesquickFragment extends NesquickComponent<{
     children: Child[];

package/lib/types/cli/transformer.d.ts

@@ -1,2 +1,3 @@
 import * as TS from "typescript";
+export declare function createCheckFunction(fName: TS.Identifier): TS.FunctionDeclaration;
 export declare const transformer: TS.TransformerFactory<TS.SourceFile>;

package/package.json

@@ -1,15 +1,38 @@
 {
   "name": "nesquick",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "React-like library with focus on drawing performance",
-  "types": "./lib/types",
-  "main": "./lib",
+  "types": "./lib/types/index.d.ts",
+  "main": "./lib/index.js",
   "typesVersions": {
     "*": {
+      ".": ["./lib/types/index.d.ts"],
       "jsx-runtime": ["./lib/types/jsx-runtime.d.ts"],
       "jsx-dev-runtime": ["./lib/types/jsx-dev-runtime.d.ts"],
-      "no-transformer/jsx-runtime": ["./lib/types/no-transformer/jsx-runtime.d.ts"],
-      "no-transformer/jsx-dev-runtime": ["./lib/types/no-transformer/jsx-dev-runtime.d.ts"]
+      "no-transformer/jsx-runtime": ["./lib/types/jsx-runtime.d.ts"],
+      "no-transformer/jsx-dev-runtime": ["./lib/types/jsx-dev-runtime.d.ts"]
+    }
+  },
+  "exports": {
+    ".": {
+      "types": "./lib/types/index.d.ts",
+      "default": "./lib/index.js"
+    },
+    "./jsx-runtime": {
+      "types": "./lib/types/jsx-runtime.d.ts",
+      "default": "./lib/jsx-runtime.js"
+    },
+    "./jsx-dev-runtime": {
+      "types": "./lib/types/jsx-dev-runtime.d.ts",
+      "default": "./lib/jsx-dev-runtime.js"
+    },
+    "./no-transformer/jsx-runtime": {
+      "types": "./lib/types/no-transformer/jsx-runtime.d.ts",
+      "default": "./lib/no-transformer/jsx-runtime.js"
+    },
+    "./no-transformer/jsx-dev-runtime": {
+      "types": "./lib/types/no-transformer/jsx-dev-runtime.d.ts",
+      "default": "./lib/no-transformer/jsx-dev-runtime.js"
     }
   },
   "bin": {