fix context

Author: SoraKumo001

README.md

@@ -80,14 +80,12 @@ Server component handles retrieving values from context
 ```tsx
 "use server";
 
-import { useMixContext } from "next-approuter-context";
 import { context1, context2 } from "./context";
+import { getMixContext } from "./next-approuter-context";
 
-export const Server = () => {
-  // If the component is async, it should be written as follows
-  // const { text, color } = await getMixContext<ContextType1>();
-  const { text, color } = useMixContext(context1);
-  const value = useMixContext(context2);
+export const Server = async () => {
+  const { text, color } = await getMixContext(context1);
+  const value = await getMixContext(context2);
   return (
     <>
       <div style={{ color }}>

esm/package.json

@@ -1,33 +1,29 @@
 {
   "name": "next-approuter-context",
-  "version": "0.0.9",
-  "main": "./dist/cjs/index.js",
-  "types": "./dist/cjs/index.d.ts",
-  "exports": {
-    "require": "./dist/cjs/index.js",
-    "import": "./dist/esm/index.js"
-  },
+  "version": "0.2.2",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "author": "SoraKumo <[email protected]>",
   "license": "MIT",
   "scripts": {
-    "build": "rimraf dist && tsc && tsc -p ./tsconfig.esm.json && cpy esm dist",
+    "build": "rimraf dist && tsc",
     "watch": "tsc -b -w",
     "lint": "eslint ./src",
     "lint:fix": "eslint --fix ./src"
   },
   "devDependencies": {
-    "@types/node": "20.10.0",
-    "@types/react": "^18.2.38",
-    "@typescript-eslint/eslint-plugin": "^6.12.0",
-    "@typescript-eslint/parser": "^6.12.0",
+    "@types/node": "20.11.25",
+    "@types/react": "^18.2.64",
+    "@typescript-eslint/eslint-plugin": "^7.1.1",
+    "@typescript-eslint/parser": "^7.1.1",
     "cpy-cli": "^5.0.0",
-    "eslint": "8.54.0",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint": "8.57.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.29.0",
-    "next": "^14.0.3",
+    "eslint-plugin-import": "^2.29.1",
+    "next": "^14.1.3",
     "rimraf": "^5.0.5",
-    "typescript": "^5.3.2"
+    "typescript": "^5.4.2"
   },
   "repository": "https://github.com/ReactLibraries/next-approuter-context",
   "keywords": [

package.json

@@ -1,10 +1,9 @@
-export { createMixServerContext } from "./server";
-export * from "./server.js";
-export * from "./client.js";
-
 import React, { use } from "react";
-import { useClientContext } from "./client";
-import { context, createMixServerContext } from "./server";
+import { useClientContext } from "./client.js";
+import { Exports, getMixContext } from "./server.js";
+
+export { getMixContext } from "./server";
+export const createMixServerContext = Exports.createMixServerContext;
 
 export const getComponentType = () =>
   !React["useState"]
@@ -13,9 +12,11 @@ export const getComponentType = () =>
     ? "Pages"
     : "Client";
 
-export const useMixContext = <T>({ name }: { name: string; type: T }) => {
-  if (getComponentType() === "Server") return use(context().get<T>(name));
-  return useClientContext<T>(name);
+export const useMixContext = <T>(context: { name: string; type: T }) => {
+  if (getComponentType() === "Server") {
+    return use(getMixContext<T>(context));
+  }
+  return useClientContext<T>(context.name);
 };
 
 export const createMixContext = <T>(name: string) => {

src/index.ts

@@ -2,7 +2,7 @@
 import { ReactNode, cache } from "react";
 import { ClientProvider } from "./client.js";
 
-export const context = cache(() => {
+const context = cache(() => {
   const property: {
     [key: string]: {
       resolve: (value: unknown) => void;
@@ -29,7 +29,8 @@ export const context = cache(() => {
   };
 });
 
-export const createMixServerContext = <T,>(name: string = "") => {
+export const Exports = async () => {};
+Exports.createMixServerContext = <T,>(name: string = "") => {
   const Provider = ({ children, value }: { children: ReactNode; value: T }) => {
     context().set(name, value);
     return (
@@ -46,4 +47,5 @@ export const createMixServerContext = <T,>(name: string = "") => {
   return result;
 };
 
-export const getMixContext = <T,>(name: string = "") => context().get<T>(name);
+export const getMixContext = async <T,>({ name }: { name: string; type: T }) =>
+  context().get<T>(name);

src/server.tsx

@@ -25,7 +25,7 @@
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
     /* Modules */
-    "module": "CommonJS" /* Specify what module code is generated. */,
+    "module": "ESNext" /* Specify what module code is generated. */,
     "rootDir": "./src" /* Specify the root folder within your source files. */,
     "moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */,
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
@@ -55,7 +55,7 @@
     // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
     // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
-    "outDir": "./dist/cjs" /* Specify an output folder for all emitted files. */,
+    "outDir": "./dist" /* Specify an output folder for all emitted files. */,
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */