the-react 1.0.0 → 1.0.1

package/package.json

@@ -1,10 +1,31 @@
 {
   "name": "the-react",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A React library for TheBugs Project",
-  "main": "dist/my-react.umd.js",
-  "module": "dist/my-react.esm.js",
-  "types": "dist/index.d.ts",
+  "main": "./src/index.js",
+  "types": "./src/index.ts",
+  "exports": {
+    ".": {
+      "types": "./src/index.ts",
+      "import": "./src/index.js"
+    },
+    "./jsx-runtime": {
+      "types": "./src/types/jsx.ts",
+      "import": "./src/jsx-runtime"
+    },
+    "./jsx-dev-runtime": {
+      "types": "./src/types/jsx.ts",
+      "import": "./src/jsx-dev-runtime"
+    },
+    "./router-dom": {
+      "types": "./src/index.ts",
+      "import": "./src/router-dom/index.ts"
+    },
+    "./hooks": {
+      "types": "./src/index.ts",
+      "import": "./src/hooks/index.ts"
+    }
+  },
   "scripts": {
     "build": "vite build",
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -31,4 +52,4 @@
     "vite": "^7.3.1",
     "vite-tsconfig-paths": "^6.1.1"
   }
-}
+}

package/src/my-react/index.ts

@@ -363,7 +363,6 @@ export class ComponentInstance<PropsType extends ComponentPropsType> {
             if (typeof vNode !== "string" && vNode.type === "component") {
                 const compInstance = this.instanceMap.get(vNode.key) as ComponentInstance<any>;
                 const compDom = compInstance.domElement;
-                console.log("compInstance", compInstance)
                 if (!compDom) { 
                     branchIndex++;
                     continue

package/src/router-dom/Router.tsx

@@ -1,9 +1,11 @@
-import type { JSXElementType } from "../types/jsx"
+import type { JSXElementType } from "@my-react/types/jsx"
 
-interface IRouterProps{
+
+interface IRouterProps {
     path: string
     children: JSXElementType
     currentPath: string
+    currentSearch?: string
 }
 
 export function matchPath(pattern: string, path: string) {
@@ -44,36 +46,71 @@ export function matchPath(pattern: string, path: string) {
     return { matches: true, params }
 }
 
-export function Router({path, children, currentPath}: IRouterProps){
-    const { matches, params } = matchPath(path, currentPath)
-    console.log(`Router ${path}:`, { currentPath, matches, params, children })
+export function parseSearch(search: string): Record<string, string> {
+    const params: Record<string, string> = {}
+    if (!search) return params
+    
+    const queryString = search.startsWith('?') ? search.slice(1) : search
+    const pairs = queryString.split('&')
+    
+    for (const pair of pairs) {
+        const [key, value] = pair.split('=')
+        if (key) {
+            params[decodeURIComponent(key)] = decodeURIComponent(value || '').replaceAll('+', ' ')
+        }
+    }
+    return params
+}
+
+export function Router({path, children, currentPath, currentSearch}: IRouterProps){
+    const { matches, params: pathParams } = matchPath(path, currentPath)
+    
+    
+    console.log(`Router ${path}:`, { 
+        currentPath, 
+        currentSearch, 
+        pathParams, 
+        children,
+    })
 
     if (!matches && path != "*") return null
 
     if (children.type === 'component') {
-        children.props = { ...children.props, ...params }
+        children.props = { 
+            ...children.props, 
+            ...pathParams, 
+        }
+        if (currentSearch){
+            const queryParams = parseSearch(currentSearch)
+            children.props = {
+                ...children.props,
+                ...queryParams
+
+            }
+            console.log(currentSearch)
+        }
         console.log(`render children ${path}`)
-        return (<div>{children}</div>)
+        return <div>{children}</div>
     }
 
-    return (<div>{children}</div>)
+    return <div>{children}</div>
 }
 
-interface ISwitchrProps{
+interface ISwitchrProps {
     children: any[]
     currentPath: string
 }
 
 export function Switch({ currentPath, children }: ISwitchrProps) {
-  const childrenArray = Array.isArray(children) ? children : [children];
-  
-  for (const child of childrenArray) {
-    if (child && child.type === 'component' && child.props.path) {
-      const { matches } = matchPath(child.props.path, currentPath);
-      if (matches || child.props.path == "*") {
-        return <div>{child}</div>;
-      }
+    const childrenArray = Array.isArray(children) ? children : [children];
+    
+    for (const child of childrenArray) {
+        if (child && child.type === 'component' && child.props.path) {
+            const { matches } = matchPath(child.props.path, currentPath);
+            if (matches || child.props.path == "*") {
+                return <div>{child}</div>;
+            }
+        }
     }
-  }
-  return null;
+    return null;
 }