gomtm 0.0.273 → 0.0.275

package/dist/esm/components/MtmErrorView.d.ts

@@ -2,5 +2,6 @@
 import { PlainMessage } from "@bufbuild/protobuf";
 import { MtmError } from "../gomtmpb/mtm/sppb/mtm_pb";
 export declare const MtmErrorView: (props: {
-    gomtmError: PlainMessage<MtmError>;
+    unaryError: PlainMessage<MtmError>;
+    retry?: () => void;
 }) => import("react").JSX.Element;

package/dist/esm/components/MtmErrorView.js

@@ -1,10 +1,14 @@
 "use client";
 import { jsx, jsxs } from "react/jsx-runtime";
 const MtmErrorView = (props) => {
-  const { gomtmError } = props;
-  return /* @__PURE__ */ jsxs("div", { children: [
-    "MtmErrorView",
-    /* @__PURE__ */ jsx("pre", { children: JSON.stringify(gomtmError, null, 2) })
+  const { unaryError, retry } = props;
+  return /* @__PURE__ */ jsxs("div", { className: "bg-red-400 p-4", children: [
+    "code: ",
+    unaryError.errCode,
+    /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx("pre", { className: "prose dark:prose-invert max-w-96 flex-wrap text-wrap break-words", children: unaryError.errMessage }) }),
+    retry && /* @__PURE__ */ jsx("button", { onClick: () => {
+      retry();
+    }, children: "retry" })
   ] });
 };
 export {

package/dist/esm/components/SSR.d.ts

@@ -0,0 +1,7 @@
+import { Message, PartialMessage } from "@bufbuild/protobuf";
+import { PropsWithChildren } from "react";
+import { MethodUnaryDescriptor } from "../connectquery";
+export declare function WithConnectHydrate<I extends Message<I>, O extends Message<O>>(props: {
+    methodSig: MethodUnaryDescriptor<I, O>;
+    input?: PartialMessage<I>;
+} & PropsWithChildren): Promise<import("react").JSX.Element>;

package/dist/esm/components/SSR.js

@@ -0,0 +1,59 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { jsx } from "react/jsx-runtime";
+import { HydrationBoundary, QueryClient, dehydrate } from "@tanstack/react-query";
+import { callUnaryMethod, createConnectInfiniteQueryKey } from "../connectquery";
+import { createTransport } from "../mtmFetcher";
+function WithConnectHydrate(props) {
+  return __async(this, null, function* () {
+    const { methodSig, input, children } = props;
+    const queryClient = new QueryClient();
+    const ts = createTransport();
+    yield queryClient.prefetchInfiniteQuery({
+      queryKey: createConnectInfiniteQueryKey(methodSig, input),
+      queryFn: (k) => {
+        return callUnaryMethod(methodSig, input, { transport: ts });
+      },
+      initialPageParam: __spreadValues({}, input)
+    });
+    const dehydratedState = dehydrate(queryClient);
+    return /* @__PURE__ */ jsx(HydrationBoundary, { state: dehydratedState, children });
+  });
+}
+export {
+  WithConnectHydrate
+};

package/dist/esm/curd/ListViewProvider.js

@@ -47,7 +47,7 @@ import { DropdownMenu, DropdownMenuContent, DropdownMenuGroup, DropdownMenuLabel
 import { Pagination, PaginationContent, PaginationEllipsis, PaginationItem, PaginationLink, PaginationNext, PaginationPrevious } from "mtxuilib/ui/pagination";
 import { MtButton } from "mtxuilib/ui/ui-mt/Button";
 import { Suspense, createContext, useCallback, useContext, useMemo, useState } from "react";
-import { MtUnaryCallErrorView } from "../components/MtUnaryCallErrorView";
+import { MtmErrorView } from "../components/MtmErrorView";
 import { useMutation, useSuspenseInfiniteQuery } from "../connectquery";
 import { useMtmApp } from "../providers/GomtmProvider";
 import { DlgCurdDebugInfo, DlgCurdDebugInfoTriggerButton } from "./CurdDetailProvider";
@@ -91,7 +91,7 @@ function ListViewProvider(props) {
     setOpenDebug,
     params,
     setParams
-  }, children: /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx("div", { children: "loading list" }), children }) });
+  }, children });
 }
 function useListView() {
   const ctx = useContext(commonListViewContext);
@@ -99,16 +99,16 @@ function useListView() {
 }
 function CommonListView() {
   const listView = useListView();
-  console.log("listView.params", listView.params);
   const listQuery = useSuspenseInfiniteQuery(listView.methodList, {
     params: {
       params: {
         q: listView.params.q || ""
       }
     },
-    pagination: {
-      page: 1
-    }
+    // pagination: {
+    //   page: 1
+    // }
+    pagination: void 0
   }, {
     pageParamKey: "pagination",
     getNextPageParam: (lastPage, allPages, lastPageParam, allPageParams) => {
@@ -132,7 +132,7 @@ function CommonListView() {
         children: listQuery.data.pages.map((page, i) => {
           var _a;
           if (page.errCode) {
-            return /* @__PURE__ */ jsx(MtUnaryCallErrorView, { unaryError: page }, i);
+            return /* @__PURE__ */ jsx(MtmErrorView, { unaryError: page }, i);
           } else {
             return /* @__PURE__ */ jsx(ListLayout, { layout: page.listLayout, children: (_a = page == null ? void 0 : page.items) == null ? void 0 : _a.map((item, j) => /* @__PURE__ */ jsx(ListItemView, { item }, `${i}-${j}`)) }, i);
           }

package/dist/esm/mtmFetcher.js

@@ -61,16 +61,14 @@ const gomtmApiUrl = () => {
 function createMtmServiceClient(service, url) {
   return createPromiseClient(
     service,
-    createConnectTransport({
-      baseUrl: gomtmApiUrl(),
-      fetch: gomtmFetcher()
-    })
+    createTransport()
   );
 }
 function createTransport() {
   return createConnectTransport({
     baseUrl: gomtmApiUrl(),
-    fetch: gomtmFetcher()
+    fetch: gomtmFetcher(),
+    useHttpGet: true
   });
 }
 function createMtmServiceClientByName(svcName, url) {
@@ -104,6 +102,10 @@ const gomtmFetcher = (initGlobal) => {
     if (!init) {
       init = {};
     }
+    if (init.body instanceof Uint8Array) {
+      const decoder = new TextDecoder();
+      init.body = decoder.decode(init.body);
+    }
     init = __spreadValues(__spreadValues({}, init), {
       headers: __spreadValues({
         // ...init.headers,
@@ -111,7 +113,7 @@ const gomtmFetcher = (initGlobal) => {
       }, (initGlobal == null ? void 0 : initGlobal.cookieStr) && { "Cookie": initGlobal == null ? void 0 : initGlobal.cookieStr })
     });
     let fetcher = fetch;
-    req.enableCache = false;
+    req.enableCache = true;
     if (req.enableCache) {
       fetcher = fetchMiddleWithCache(fetch);
     }
@@ -121,7 +123,6 @@ const gomtmFetcher = (initGlobal) => {
         init
       });
       const responseData = yield fetcher(input, init);
-      console.log("[mtmfetch response]", responseData);
       return responseData;
     } catch (e) {
       console.error("[mtmfetch error]", {

package/dist/esm/providers/GomtmProvider.js

@@ -93,7 +93,9 @@ const MtConnectProvider = (props) => {
       }),
       jsonOptions: {
         typeRegistry: anypbTypeReg
-      }
+      },
+      useHttpGet: true,
+      useBinaryFormat: false
     });
   }, [mtapp.backendUrl, mtapp.cookieStr]);
   return /* @__PURE__ */ jsx(TransportProvider, { transport, children });