TechQuery
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,8 @@ package-lock.json
 yarn.lock
 node_modules/
 dist/
-docs/
+docs/
+jsx-runtime.js
+jsx-runtime.d.ts
+jsx-dev-runtime.js
+jsx-dev-runtime.d.ts
diff --git a/ReadMe.md b/ReadMe.md
@@ -12,7 +12,7 @@
 `index.tsx`
 
 ```JavaScript
-import { Command, createCommand } from 'commander-jsx';
+import { Command } from 'commander-jsx';
 
 Command.execute(
     <Command
@@ -51,8 +51,8 @@ Command.execute(
     "compilerOptions": {
         "module": "CommonJS",
         "moduleResolution": "Node",
-        "jsx": "react",
-        "jsxFactory": "createCommand",
+        "jsx": "react-jsx",
+        "jsxImportSource": "commander-jsx",
         "target": "ES2017",
         "outDir": "dist/"
     }

diff --git a/package.json b/package.json
@@ -56,7 +56,8 @@
     "scripts": {
         "prepare": "husky install",
         "test": "lint-staged && jest",
-        "build": "rm -rf dist/ docs/  &&  tsc  &&  typedoc source/",
+        "parcel": "tsc  &&  cp dist/jsx-runtime.* .  &&  cp jsx-runtime.js jsx-dev-runtime.js  &&  cp jsx-runtime.d.ts jsx-dev-runtime.d.ts",
+        "build": "rm -rf dist/ docs/  &&  npm run parcel  &&  typedoc source/",
         "start": "typedoc source/  &&  open-cli docs/index.html",
         "prepublishOnly": "npm test  &&  npm run build"
     }

diff --git a/source/creator.ts b/source/creator.ts
@@ -1,21 +1,3 @@
-import { Command, CommandMeta } from './Command';
-
-declare global {
-    namespace JSX {
-        interface IntrinsicElements<T> {
-            [key: string]: Command<T>;
-        }
-    }
-}
-
-export function createCommand<T>(
-    component: { new (meta: CommandMeta<T>): Command<T> },
-    props: CommandMeta<T>,
-    ...children: Command<T>[]
-) {
-    return new component({ ...props, children });
-}
-
 export function createTable(list: string[][]) {
     const counts = list.reduce((counts, row) => {
         for (const [index, { length }] of row.entries())

diff --git a/source/jsx-runtime.ts b/source/jsx-runtime.ts
@@ -0,0 +1,45 @@
+import { Command, CommandMeta } from './Command';
+
+declare global {
+    namespace JSX {
+        interface ElementType<T = any> {
+            new (meta: CommandMeta<T>): Command<T>;
+        }
+        interface Element extends Command<any> {}
+        interface IntrinsicAttributes {
+            children?: Command<any> | Command<any>[];
+        }
+    }
+}
+
+/**
+ * JSX runtime for CommanderJSX
+ * @see {@link https://github.com/reactjs/rfcs/blob/createlement-rfc/text/0000-create-element-changes.md}
+ * @see {@link https://babeljs.io/docs/babel-plugin-transform-react-jsx}
+ */
+export function jsx<T>(
+    type: { new (meta: CommandMeta<T>): Command<T> },
+    {
+        children,
+        ...props
+    }: CommandMeta<T> & {
+        children?: Command<T> | Command<T>[];
+    }
+): Command<T> {
+    const childArray = children
+        ? Array.isArray(children)
+            ? children
+            : [children]
+        : [];
+
+    return new type({ ...props, children: childArray } as CommandMeta<T>);
+}
+
+export const jsxs = jsx;
+export const jsxDEV = jsx;
+
+/**
+ * Fragment support (not typically used in CommanderJSX, but required by JSX runtime)
+ */
+export const Fragment = ({ children }: { children?: Command<any>[] }) =>
+    Array.isArray(children) ? children : children ? [children] : [];
diff --git a/test/Command.spec.tsx b/test/Command.spec.tsx
@@ -1,6 +1,6 @@
 import { currentModulePath, packageOf } from '@tech_query/node-toolkit';
 
-import { createCommand, Command } from '../source';
+import { Command } from '../source';
 
 const log = (console.log = jest.fn()),
     CMP = currentModulePath();

diff --git a/test/creator.spec.tsx b/test/creator.spec.tsx
@@ -1,4 +1,4 @@
-import { createCommand, Command, createTable } from '../source';
+import { Command, createTable } from '../source';
 
 describe('Creating utility', () => {
     it('should create a Command tree with JSX', () => {

diff --git a/tsconfig.json b/tsconfig.json
@@ -3,14 +3,18 @@
         "module": "CommonJS",
         "moduleResolution": "Node",
         "esModuleInterop": true,
-        "jsx": "react",
-        "jsxFactory": "createCommand",
+        "jsx": "react-jsx",
+        "jsxImportSource": "commander-jsx",
         "strict": true,
         "target": "ES2017",
         "lib": ["ES2022", "DOM"],
         "declaration": true,
         "importHelpers": true,
-        "outDir": "dist/"
+        "outDir": "dist/",
+        "paths": {
+            "commander-jsx/jsx-runtime": ["./source/jsx-runtime"],
+            "commander-jsx/jsx-dev-runtime": ["./source/jsx-runtime"]
+        }
     },
     "include": ["source/*.ts"],
     "typedocOptions": {