nesquick 0.0.21 → 0.0.23

package/lib/NesquickComponent.js

@@ -2,14 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NesquickComponent = void 0;
 const State_1 = require("./State");
-function functionizeProps(props) {
-    for (const k in props) {
-        if (typeof props[k] !== "function") {
-            const v = props[k];
-            props[k] = () => v;
-        }
-    }
-}
 const SVGNamespaces = new Map([
     ["xlink", "http://www.w3.org/1999/xlink"],
     ["xml", "http://www.w3.org/XML/1998/namespace"]
@@ -27,7 +19,6 @@ class NesquickComponent {
     render(document) {
         State_1.subscriptions.set(this._subscriptions);
         if (typeof this._render === "function") {
-            functionizeProps(this.props);
             const element = this._render(this.props);
             if (this._xmlns) {
                 element.setXmlns(this._xmlns);

package/lib/cli/nesquick-tsc.js

@@ -0,0 +1,12 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tsc_1 = require("./tsc");
+const transformer_1 = require("./transformer");
+(0, tsc_1.tsc)({
+    argv: process.argv,
+    cwd: process.cwd(),
+    transformers: {
+        before: [transformer_1.transformer]
+    }
+});

package/lib/cli/processArgv.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProject = getProject;
+const Path = require("path");
+function getProject(argv) {
+    let nextIsProject = false;
+    for (let i = 0; i < argv.length; i++) {
+        if (argv[i].startsWith("--")) {
+            nextIsProject = argv[i].substring(2) === "project";
+        }
+        else if (argv[i].startsWith("-")) {
+            nextIsProject = argv[i].substring(1) === "p";
+        }
+        else if (nextIsProject) {
+            return Path.resolve(process.cwd(), argv[i]);
+        }
+    }
+    return null;
+}

package/lib/cli/transformer.js

@@ -35,7 +35,12 @@ function hasIdentifier(node) {
 }
 const transformer = context => {
     return sourceFile => {
+        let isComponent = false;
         const visitorGeneric = node => {
+            if (TS.isJsxOpeningElement(node)) {
+                const firstLetter = node.tagName.getText()[0];
+                isComponent = firstLetter !== firstLetter.toLowerCase();
+            }
             if (TS.isJsxExpression(node)) {
                 return TS.visitEachChild(node, visitorExpression, context);
             }
@@ -57,7 +62,7 @@ const transformer = context => {
                     return TS.factory.createArrowFunction(undefined, undefined, [], undefined, TS.factory.createToken(TS.SyntaxKind.EqualsGreaterThanToken), node);
                 }
             }
-            else if (!TS.isFunctionLike(node) && TS.isExpression(node) && hasIdentifier(node)) {
+            else if (!TS.isFunctionLike(node) && TS.isExpression(node) && (isComponent || hasIdentifier(node))) {
                 return TS.factory.createArrowFunction(undefined, undefined, [], undefined, TS.factory.createToken(TS.SyntaxKind.EqualsGreaterThanToken), node);
             }
             return node;

package/lib/cli/tsc.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tsc = tsc;
+const TS = require("typescript");
+const processArgv_1 = require("./processArgv");
+function tsc(options) {
+    const oldDir = process.cwd();
+    try {
+        if (options.cwd !== oldDir) {
+            process.chdir(options.cwd);
+        }
+        let project = (0, processArgv_1.getProject)(options.argv);
+        if (project == null) {
+            const configPath = TS.findConfigFile(options.cwd, TS.sys.fileExists, "tsconfig.json");
+            if (configPath != null) {
+                project = configPath;
+            }
+        }
+        if (!project) {
+            throw new Error("tsconfig.json not found");
+        }
+        const res = TS.readConfigFile(project, TS.sys.readFile);
+        const formatHost = {
+            getCanonicalFileName: f => f,
+            getCurrentDirectory: TS.sys.getCurrentDirectory,
+            getNewLine: () => TS.sys.newLine,
+        };
+        if (res.error) {
+            console.error(TS.formatDiagnosticsWithColorAndContext([res.error], formatHost));
+            throw new Error(`Error reading ${project}`);
+        }
+        else if (res.config == null) {
+            throw new Error(`Error reading ${project}`);
+        }
+        else {
+            const jsonConfig = TS.parseJsonConfigFileContent(res.config, TS.sys, options.cwd, {}, project);
+            const program = TS.createProgram({
+                options: jsonConfig.options,
+                rootNames: jsonConfig.fileNames,
+                configFileParsingDiagnostics: jsonConfig.errors
+            });
+            const preDiagnostics = TS.getPreEmitDiagnostics(program);
+            const programEmit = program.emit(void 0, void 0, void 0, void 0, options.transformers);
+            const allDiagnostics = [...preDiagnostics, ...programEmit.diagnostics, ...jsonConfig.errors];
+            if (allDiagnostics.length) {
+                console.error(TS.formatDiagnosticsWithColorAndContext(allDiagnostics, formatHost));
+                throw new Error(`Error compiling project`);
+            }
+        }
+    }
+    finally {
+        if (options.cwd !== oldDir) {
+            process.chdir(oldDir);
+        }
+    }
+}

package/lib/no-transformer/jsx-dev-runtime.js

@@ -0,0 +1,22 @@
+"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.jsxDEV = jsxDEV;
+const jsx_runtime_1 = require("./jsx-runtime");
+__exportStar(require("./jsx-runtime"), exports);
+function jsxDEV(type, props, key, _isStaticChildren, _source, _self) {
+    return (0, jsx_runtime_1.jsx)(type, props, key);
+}

package/lib/no-transformer/jsx-runtime.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JSX = exports.jsx = exports.Fragment = void 0;
+exports.jsxs = jsxs;
+const NesquickComponent_1 = require("../NesquickComponent");
+const NesquickFragment_1 = require("../NesquickFragment");
+exports.Fragment = Symbol();
+function functionizeProps(props) {
+    for (const k in props) {
+        if (typeof props[k] !== "function") {
+            const v = props[k];
+            props[k] = () => v;
+        }
+    }
+}
+function jsxs(type, props, key) {
+    if (type === exports.Fragment) {
+        return new NesquickFragment_1.NesquickFragment(props.children);
+    }
+    if (typeof type !== "string") {
+        functionizeProps(props);
+    }
+    else if (key !== undefined) {
+        props.key = key;
+    }
+    return new NesquickComponent_1.NesquickComponent(type, props);
+}
+exports.jsx = jsxs;
+var JSX;
+(function (JSX) {
+})(JSX || (exports.JSX = JSX = {}));

package/lib/types/cli/nesquick-tsc.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

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

@@ -0,0 +1 @@
+export declare function getProject(argv: string[]): string | null;

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

@@ -0,0 +1,7 @@
+import * as TS from "typescript";
+export type CompileOptions = {
+    argv: string[];
+    cwd: string;
+    transformers?: TS.CustomTransformers;
+};
+export declare function tsc(options: CompileOptions): void;

package/lib/types/jsx-runtime.d.ts

@@ -3,19 +3,24 @@ import { NesquickFragment } from "./NesquickFragment";
 export declare const Fragment: unique symbol;
 export declare function jsxs<P extends ComponentProps>(type: string | FunctionComponent<P> | typeof Fragment, props: P, key?: string | number | null): NesquickFragment | NesquickComponent<P>;
 export declare const jsx: typeof jsxs;
+type HasUndefined<T, K extends keyof T> = {
+    [L in K]-?: T[K] | undefined;
+} extends {
+    [L in K]?: T[K];
+} ? undefined extends T[K] ? true : false : false;
 declare const WrappedFunctionType: unique symbol;
 type WrappedFunction<T> = (() => T) & {
     readonly [WrappedFunctionType]?: T;
 };
-type UserProp<T> = T extends (...args: infer A) => infer R ? (((...args: A) => R) | T) : WrappedFunction<T>;
-type ComponentProp<T> = T extends {
-    readonly [WrappedFunctionType]?: infer R;
-} ? (T | R) : T extends (...args: any[]) => any ? T : (T | (() => T));
+type UserProp<T> = T extends (...args: any[]) => any ? T : WrappedFunction<T>;
 type UserProps<T> = {
-    [K in keyof T]: UserProp<T[K]>;
+    readonly [K in keyof T]: HasUndefined<T, K> extends true ? UserProp<T[K] | undefined> : UserProp<Exclude<T[K], undefined>>;
 };
+type JSXProp<T> = T extends {
+    readonly [WrappedFunctionType]?: infer R;
+} ? R : T;
 type JSXProps<T> = keyof T extends never ? {} : {
-    [K in keyof T]: ComponentProp<T[K]>;
+    [K in keyof T]: JSXProp<T[K]>;
 };
 export type Generic<T> = T extends (...args: any) => infer R ? R : T;
 export { UserProps as Props };
@@ -32,23 +37,22 @@ export declare namespace JSX {
     };
     export interface Props<T extends EventTarget = HTMLElement> extends JSXHTMLEvent<T>, JSXSVGEvent<T> {
         [k: string]: any;
-        style?: StyleProps | string;
+        style?: Style;
         xmlns?: string | null;
         ref?: ((el: T) => void) | null;
     }
+    export type Style = StyleProps | string;
     export type StyleProps = {
         [K in keyof CSSStyleDeclaration]?: CSSStyleDeclaration[K] extends Function ? never : CSSStyleDeclaration[K] | (() => CSSStyleDeclaration[K]);
     };
     export type HTMLProps<T extends HTMLElement = HTMLElement> = Props<T>;
     export type SVGProps<T extends SVGElement = SVGElement> = Props<T>;
-    export type JSXElements = {
+    export type IntrinsicElements = {
         [K in keyof HTMLElementTagNameMap]: HTMLProps<HTMLElementTagNameMap[K]>;
     } & {
         [K in keyof SVGElementTagNameMap]: SVGProps<SVGElementTagNameMap[K]>;
     };
     export type Element = NesquickComponent<any>;
-    export interface IntrinsicElements extends JSXElements {
-    }
     export type ElementType = keyof IntrinsicElements | Component<any> | typeof NesquickComponent<any>;
     const NotEmptyObject: unique symbol;
     export type IntrinsicAttributes = {

package/lib/types/no-transformer/jsx-dev-runtime.d.ts

@@ -0,0 +1,9 @@
+import { Fragment } from "./jsx-runtime";
+import { FunctionComponent, ComponentProps } from "../NesquickComponent";
+export * from "./jsx-runtime";
+type JsxSource = {
+    fileName: string;
+    lineNumber: number;
+    columnNumber?: number;
+};
+export declare function jsxDEV<P extends ComponentProps>(type: string | FunctionComponent<P> | typeof Fragment, props: P, key: string | number | null, _isStaticChildren: boolean, _source: JsxSource, _self: any): import("..").NesquickFragment | import("../NesquickComponent").NesquickComponent<P>;

package/lib/types/no-transformer/jsx-runtime.d.ts

@@ -0,0 +1,71 @@
+import { FunctionComponent, ComponentProps, NesquickComponent } from "../NesquickComponent";
+import { NesquickFragment } from "../NesquickFragment";
+export declare const Fragment: unique symbol;
+export declare function jsxs<P extends ComponentProps>(type: string | FunctionComponent<P> | typeof Fragment, props: P, key?: string | number | null): NesquickFragment | NesquickComponent<P>;
+export declare const jsx: typeof jsxs;
+type HasUndefined<T, K extends keyof T> = {
+    [L in K]-?: T[K] | undefined;
+} extends {
+    [L in K]?: T[K];
+} ? undefined extends T[K] ? true : false : false;
+declare const WrappedFunctionType: unique symbol;
+type WrappedFunction<T> = (() => T) & {
+    readonly [WrappedFunctionType]?: T;
+};
+type UserProp<T> = T extends (...args: infer A) => infer R ? (((...args: A) => R) | T) : WrappedFunction<T>;
+type UserProps<T> = {
+    readonly [K in keyof T]: HasUndefined<T, K> extends true ? UserProp<T[K] | undefined> : UserProp<Exclude<T[K], undefined>>;
+};
+type JSXProp<T> = T extends {
+    readonly [WrappedFunctionType]?: infer R;
+} ? (T | R) : T extends (...args: any[]) => any ? T : (T | (() => T));
+type JSXProps<T> = keyof T extends never ? {} : {
+    [K in keyof T]: JSXProp<T[K]>;
+};
+export type Generic<T> = T extends (...args: any) => infer R ? R : T;
+export { UserProps as Props };
+export type Component<P = {}> = (props: UserProps<P>) => JSX.Element;
+export declare namespace JSX {
+    export type JSXEvent<T extends Event, T2 extends EventTarget> = T & {
+        currentTarget: T2;
+    };
+    export type JSXHTMLEvent<T extends EventTarget> = {
+        [K in keyof HTMLElementEventMap as `on${Capitalize<K>}`]?: (e: JSXEvent<HTMLElementEventMap[K], T>) => void;
+    };
+    export type JSXSVGEvent<T extends EventTarget> = {
+        [K in keyof SVGElementEventMap as `on${Capitalize<K>}`]?: (e: JSXEvent<SVGElementEventMap[K], T>) => void;
+    };
+    export interface Props<T extends EventTarget = HTMLElement> extends JSXHTMLEvent<T>, JSXSVGEvent<T> {
+        [k: string]: any;
+        style?: Style;
+        xmlns?: string | null;
+        ref?: ((el: T) => void) | null;
+    }
+    export type Style = StyleProps | string;
+    export type StyleProps = {
+        [K in keyof CSSStyleDeclaration]?: CSSStyleDeclaration[K] extends Function ? never : CSSStyleDeclaration[K] | (() => CSSStyleDeclaration[K]);
+    };
+    export type HTMLProps<T extends HTMLElement = HTMLElement> = Props<T>;
+    export type SVGProps<T extends SVGElement = SVGElement> = Props<T>;
+    export type JSXElements = {
+        [K in keyof HTMLElementTagNameMap]: HTMLProps<HTMLElementTagNameMap[K]>;
+    } & {
+        [K in keyof SVGElementTagNameMap]: SVGProps<SVGElementTagNameMap[K]>;
+    };
+    export type Element = NesquickComponent<any>;
+    export interface IntrinsicElements extends JSXElements {
+    }
+    export type ElementType = keyof IntrinsicElements | Component<any> | typeof NesquickComponent<any>;
+    const NotEmptyObject: unique symbol;
+    export type IntrinsicAttributes = {
+        [NotEmptyObject]?: typeof NotEmptyObject;
+    };
+    export interface ElementAttributesProperty {
+        props: {};
+    }
+    export interface ElementChildrenAttribute {
+        children: {};
+    }
+    export type LibraryManagedAttributes<_, P> = JSXProps<P>;
+    export {};
+}

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "nesquick",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "React-like library with focus on drawing performance",
   "types": "./lib/types",
   "main": "./lib",
   "typesVersions": {
     "*": {
       "jsx-runtime": ["./lib/types/jsx-runtime.d.ts"],
-      "jsx-dev-runtime": ["./lib/types/jsx-dev-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"]
     }
   },
   "bin": {
@@ -17,6 +19,7 @@
   "sideEffects": false,
   "files": [
     "lib/",
+    "no-transformer/",
     "jsx-runtime.js",
     "jsx-dev-runtime.js"
   ],