gomtm 0.0.284 → 0.0.286

package/dist/esm/components/SSR.js

@@ -36,15 +36,18 @@ var __async = (__this, __arguments, generator) => {
 };
 import { jsx } from "react/jsx-runtime";
 import { HydrationBoundary, QueryClient, dehydrate } from "@tanstack/react-query";
-import { goMtmQueryFn } from "../gomtmQuery";
-import { createInfiniteQueryKey } from "../mtmFetcher";
+import { createInfiniteQueryKey, goMtmQueryFn } from "../mtmFetcher";
 function PrefetchConnectInfiniteQuery(props) {
   return __async(this, null, function* () {
     const { svc, method, input, children } = props;
     const queryClient = new QueryClient();
+    const queryKey = createInfiniteQueryKey(svc, method, input);
+    const data = yield goMtmQueryFn({ svc, method, input });
     yield queryClient.prefetchInfiniteQuery({
-      queryKey: createInfiniteQueryKey(svc, method, input),
-      queryFn: (k) => goMtmQueryFn({ svc, method, input }),
+      queryKey,
+      queryFn: (k) => __async(this, null, function* () {
+        return data;
+      }),
       initialPageParam: __spreadValues({}, input)
     });
     const dehydratedState = dehydrate(queryClient);

package/dist/esm/curd/list-item/ListLayout.d.ts

@@ -2,4 +2,4 @@ import { PropsWithChildren } from "react";
 import { ListViewLayout } from "../../gomtmpb/mtm/sppb/mtm_pb";
 export declare const ListLayout: (props: {
     layout: ListViewLayout;
-} & PropsWithChildren) => string | number | bigint | boolean | import("react").JSX.Element | Iterable<import("react").ReactNode> | Promise<import("react").AwaitedReactNode> | null | undefined;
+} & PropsWithChildren) => string | number | bigint | boolean | Iterable<import("react").ReactNode> | Promise<import("react").AwaitedReactNode> | import("react").JSX.Element | null | undefined;

package/dist/esm/curd/listview/ListViewProvider.js

@@ -1,5 +1,7 @@
 "use client";
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
@@ -15,6 +17,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -35,7 +38,7 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
 import { debounce } from "lodash";
 import { Icons } from "mtxuilib/icons/icons";
 import { cn } from "mtxuilib/lib/utils";
@@ -56,13 +59,13 @@ import { ListLayout } from "../list-item/ListLayout";
 import { ListViewLayoutDefault } from "./listview-layouts/default";
 import ListViewLayoutDemo from "./listview-layouts/listviewlayout-demo";
 const ALL_Layouts = [
-  "demo",
   "default",
-  "none"
+  "demo"
 ];
 const commonListViewContext = createContext(void 0);
 function ListViewProvider(props) {
-  const { children, svc, methodList, methodDelete, slugPath, methodCreate, methodGet } = props;
+  var _a;
+  const { children, svc, methodList, methodDelete, slugPath, methodCreate, methodGet, params } = props;
   const mtapp = useMtmApp();
   const [_svc, setSvc] = useState(svc);
   const [openRemove, setOpenRemove] = useState(false);
@@ -70,15 +73,17 @@ function ListViewProvider(props) {
   const [activateItem, setActivateItem] = useState(void 0);
   const [openEdit, setOpenEdit] = useState(false);
   const [openDebug, setOpenDebug] = useState(false);
-  const [_params, _setParams] = useState(mtapp.globalSearchParams);
+  const [_params, _setParams] = useState(params);
   const [detailData, setDetailData] = useState(void 0);
   const [layout, setLayout] = useState("default");
-  const params = useMemo(() => {
-    var _a;
-    return {
-      q: (_a = mtapp.globalSearchParams) == null ? void 0 : _a.q
-    };
-  }, [mtapp.globalSearchParams]);
+  const __params = useMemo(() => {
+    var _a2, _b;
+    return __spreadProps(__spreadValues({}, params), {
+      params: __spreadValues(__spreadValues({}, params.params), ((_a2 = mtapp.globalSearchParams) == null ? void 0 : _a2.q) && {
+        q: (_b = mtapp.globalSearchParams) == null ? void 0 : _b.q
+      })
+    });
+  }, [(_a = mtapp.globalSearchParams) == null ? void 0 : _a.q, params]);
   const setParams = useCallback(debounce((values) => {
     _setParams(values);
   }, CONST_debounce_INPUT), [_setParams]);
@@ -99,14 +104,16 @@ function ListViewProvider(props) {
     setOpenEdit,
     openDebug,
     setOpenDebug,
-    params,
+    params: __params,
     setParams,
     detailData,
     setDetailData,
     layout,
     setLayout
   }, children: /* @__PURE__ */ jsxs(ListViewLayout, { children: [
+    " ",
     children,
+    " ",
     /* @__PURE__ */ jsx(ListViewLayoutSwitch, {})
   ] }) });
 }
@@ -203,15 +210,15 @@ const ListViewActions = () => {
 const ListViewLayout = (props) => {
   const listView = useListView();
   const { children } = props;
-  return /* @__PURE__ */ jsx(Fragment, { children: listView.layout == "default" ? /* @__PURE__ */ jsxs(ListViewLayoutDefault, { children: [
-    " ",
-    children,
-    " "
-  ] }) : listView.layout == "demo" ? /* @__PURE__ */ jsxs(ListViewLayoutDemo, { children: [
-    " ",
-    children,
-    " "
-  ] }) : listView.layout == "none" ? /* @__PURE__ */ jsx(Fragment, { children }) : children });
+  const Layout = useMemo(() => {
+    switch (listView.layout) {
+      case "demo":
+        return ListViewLayoutDemo;
+      default:
+        return ListViewLayoutDefault;
+    }
+  }, [listView.layout]);
+  return /* @__PURE__ */ jsx(Layout, { children });
 };
 const ListViewLayoutSwitch = () => {
   const listview = useListView();

package/dist/esm/gomtmQuery.d.ts

@@ -1,14 +1,4 @@
-interface goMtmQueryFnProps {
-    svc: string;
-    method: string;
-    input?: any;
-    options?: {
-        url: string;
-    };
-}
-export declare const goMtmQueryFn: (props: goMtmQueryFnProps) => Promise<any>;
 export declare const useGomtmQuery: (svc: string, method: string, input?: any) => import("@tanstack/react-query").UseQueryResult<any, Error>;
 export declare const useGomtmSuspenseQuery: (svc: string, method: string, input?: any) => import("@tanstack/react-query").UseSuspenseQueryResult<any, Error>;
 export declare const useGomtmSuspenseInfiniteQuery: (svc: string, method: string, input?: any) => import("@tanstack/react-query").UseSuspenseInfiniteQueryResult<import("@tanstack/react-query").InfiniteData<any, unknown>, Error>;
 export declare const useGomtmMutation: (svc: string, method: string) => import("@tanstack/react-query").UseMutationResult<any, Error, any, unknown>;
-export {};

package/dist/esm/gomtmQuery.js

@@ -1,44 +1,8 @@
 "use client";
-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 { useMutation, useQuery, useSuspenseInfiniteQuery, useSuspenseQuery } from "@tanstack/react-query";
-import { camelCase } from "lodash";
 import { MTM_API_PREFIX } from "./consts";
-import { createMtmServiceClientByName, createQueryKey } from "./mtmFetcher";
+import { createInfiniteQueryKey, createQueryKey, goMtmQueryFn } from "./mtmFetcher";
 import { useMtmApp } from "./providers/GomtmProvider";
-const goMtmQueryFn = (props) => __async(void 0, null, function* () {
-  var _a;
-  const client = createMtmServiceClientByName(props.svc, (_a = props.options) == null ? void 0 : _a.url);
-  if (!client) {
-    throw new Error(`missing mtmclient:"${props.svc}"`);
-  }
-  const methodName = camelCase(props.method);
-  const methodFn = client[methodName];
-  if (!methodFn) {
-    throw new Error(`missing mtmclient method:"${props.svc}.${methodName}"`);
-  }
-  const data = yield methodFn(props.input);
-  console.log(`goMtmQueryFn ${props.svc}.${props.method}.${props.input}`, data);
-  return data;
-});
 const useGomtmQuery = (svc, method, input) => {
   const query = useQuery({
     queryKey: createQueryKey(svc, method, input),
@@ -64,7 +28,7 @@ const useGomtmSuspenseQuery = (svc, method, input) => {
 const useGomtmSuspenseInfiniteQuery = (svc, method, input) => {
   const mtapp = useMtmApp();
   const query = useSuspenseInfiniteQuery({
-    queryKey: createQueryKey(svc, method, input),
+    queryKey: createInfiniteQueryKey(svc, method, input),
     queryFn: (k) => goMtmQueryFn({
       svc,
       method,
@@ -94,7 +58,6 @@ const useGomtmMutation = (svc, method) => {
   });
 };
 export {
-  goMtmQueryFn,
   useGomtmMutation,
   useGomtmQuery,
   useGomtmSuspenseInfiniteQuery,

package/dist/esm/gomtmpb/mtm/sppb/mtm_pb.d.ts

@@ -477,7 +477,7 @@ export declare class ItemAction extends Message<ItemAction> {
     static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): ItemAction;
     static equals(a: ItemAction | PlainMessage<ItemAction> | undefined, b: ItemAction | PlainMessage<ItemAction> | undefined): boolean;
 }
-export declare class ListParams extends Message<ListParams> {
+export declare class CommontListReq extends Message<CommontListReq> {
     slugs?: string;
     params: {
         [key: string]: string;
@@ -487,18 +487,6 @@ export declare class ListParams extends Message<ListParams> {
     cursor?: string;
     rerefer?: string;
     siteHost?: string;
-    constructor(data?: PartialMessage<ListParams>);
-    static readonly runtime: typeof proto3;
-    static readonly typeName = "sppb.ListParams";
-    static readonly fields: FieldList;
-    static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): ListParams;
-    static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): ListParams;
-    static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): ListParams;
-    static equals(a: ListParams | PlainMessage<ListParams> | undefined, b: ListParams | PlainMessage<ListParams> | undefined): boolean;
-}
-export declare class CommontListReq extends Message<CommontListReq> {
-    params?: ListParams;
-    pagination?: Paging;
     constructor(data?: PartialMessage<CommontListReq>);
     static readonly runtime: typeof proto3;
     static readonly typeName = "sppb.CommontListReq";

package/dist/esm/gomtmpb/mtm/sppb/mtm_pb.js

@@ -1912,10 +1912,13 @@ __publicField(_ItemAction, "fields", proto3.util.newFieldList(() => [
   { no: 2, name: "item_actions", kind: "message", T: ListItemAction, repeated: true }
 ]));
 let ItemAction = _ItemAction;
-const _ListParams = class _ListParams extends Message {
+const _CommontListReq = class _CommontListReq extends Message {
   constructor(data) {
     super();
     /**
+     * ListParams params = 1;
+     * Paging pagination = 2;
+     *
      * @generated from field: optional string slugs = 1;
      */
     __publicField(this, "slugs");
@@ -1957,21 +1960,21 @@ const _ListParams = class _ListParams extends Message {
     proto3.util.initPartial(data, this);
   }
   static fromBinary(bytes, options) {
-    return new _ListParams().fromBinary(bytes, options);
+    return new _CommontListReq().fromBinary(bytes, options);
   }
   static fromJson(jsonValue, options) {
-    return new _ListParams().fromJson(jsonValue, options);
+    return new _CommontListReq().fromJson(jsonValue, options);
   }
   static fromJsonString(jsonString, options) {
-    return new _ListParams().fromJsonString(jsonString, options);
+    return new _CommontListReq().fromJsonString(jsonString, options);
   }
   static equals(a, b) {
-    return proto3.util.equals(_ListParams, a, b);
+    return proto3.util.equals(_CommontListReq, a, b);
   }
 };
-__publicField(_ListParams, "runtime", proto3);
-__publicField(_ListParams, "typeName", "sppb.ListParams");
-__publicField(_ListParams, "fields", proto3.util.newFieldList(() => [
+__publicField(_CommontListReq, "runtime", proto3);
+__publicField(_CommontListReq, "typeName", "sppb.CommontListReq");
+__publicField(_CommontListReq, "fields", proto3.util.newFieldList(() => [
   { no: 1, name: "slugs", kind: "scalar", T: 9, opt: true },
   { no: 2, name: "params", kind: "map", K: 9, V: {
     kind: "scalar",
@@ -1984,39 +1987,6 @@ __publicField(_ListParams, "fields", proto3.util.newFieldList(() => [
   { no: 9, name: "rerefer", kind: "scalar", T: 9, opt: true },
   { no: 10, name: "site_host", kind: "scalar", T: 9, opt: true }
 ]));
-let ListParams = _ListParams;
-const _CommontListReq = class _CommontListReq extends Message {
-  constructor(data) {
-    super();
-    /**
-     * @generated from field: sppb.ListParams params = 1;
-     */
-    __publicField(this, "params");
-    /**
-     * @generated from field: sppb.Paging pagination = 2;
-     */
-    __publicField(this, "pagination");
-    proto3.util.initPartial(data, this);
-  }
-  static fromBinary(bytes, options) {
-    return new _CommontListReq().fromBinary(bytes, options);
-  }
-  static fromJson(jsonValue, options) {
-    return new _CommontListReq().fromJson(jsonValue, options);
-  }
-  static fromJsonString(jsonString, options) {
-    return new _CommontListReq().fromJsonString(jsonString, options);
-  }
-  static equals(a, b) {
-    return proto3.util.equals(_CommontListReq, a, b);
-  }
-};
-__publicField(_CommontListReq, "runtime", proto3);
-__publicField(_CommontListReq, "typeName", "sppb.CommontListReq");
-__publicField(_CommontListReq, "fields", proto3.util.newFieldList(() => [
-  { no: 1, name: "params", kind: "message", T: ListParams },
-  { no: 2, name: "pagination", kind: "message", T: Paging }
-]));
 let CommontListReq = _CommontListReq;
 const _CommontListRes = class _CommontListRes extends Message {
   constructor(data) {
@@ -7142,7 +7112,6 @@ export {
   ItemAction,
   ListItem,
   ListItemAction,
-  ListParams,
   ListViewActionType,
   ListViewLayout,
   LogLine,

package/dist/esm/ly/LayoutBase.js

@@ -7,7 +7,7 @@ import { Dialog, DialogContent, DialogTitle } from "mtxuilib/ui/dialog";
 import { TooltipProvider } from "mtxuilib/ui/tooltip";
 import { MtButton } from "mtxuilib/ui/ui-mt/Button";
 import { AppProgressBar as ProgressBar } from "next-nprogress-bar";
-import { Suspense, lazy, useState } from "react";
+import { Suspense, lazy, useMemo, useState } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 import { Toaster } from "sonner";
 import { HOTKEY_Switchlayout } from "../consts";
@@ -26,12 +26,20 @@ const LzFrontLayout = lazy(() => import("./front-layout"));
 const LayoutBase = (props) => {
   const { children } = props;
   const mtapp = useMtmApp();
+  const LayoutComponent = useMemo(() => {
+    switch (mtapp.layoutName) {
+      case "dash5":
+        return LzDash5;
+      case "debug":
+        return LzDebugLayout;
+      case "demo":
+        return LzDemoLayout;
+      default:
+        return LzFrontLayout;
+    }
+  }, [mtapp.layoutName]);
   return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs(TooltipProvider, { delayDuration: 0, children: [
-    mtapp.layoutName == "front" ? /* @__PURE__ */ jsxs(LzFrontLayout, { children: [
-      " ",
-      children,
-      " "
-    ] }) : mtapp.layoutName == "dash5" ? /* @__PURE__ */ jsx(LzDash5, { children }) : mtapp.layoutName == "debug" ? /* @__PURE__ */ jsx(LzDebugLayout, { children }) : mtapp.layoutName == "demo1" ? /* @__PURE__ */ jsx(LzDemoLayout, { children }) : mtapp.layoutName == "default" ? /* @__PURE__ */ jsx(Fragment, { children }) : children,
+    /* @__PURE__ */ jsx(LayoutComponent, { children }),
     /* @__PURE__ */ jsx(
       ProgressBar,
       {

package/dist/esm/mtmFetcher.d.ts

@@ -1,6 +1,15 @@
 import { ServiceType } from "@bufbuild/protobuf";
 export declare const createQueryKey: (svc: string, method: string, input: any) => any[];
 export declare const createInfiniteQueryKey: (svc: string, method: string, input: any) => any[];
+interface goMtmQueryFnProps {
+    svc: string;
+    method: string;
+    input?: any;
+    options?: {
+        url: string;
+    };
+}
+export declare const goMtmQueryFn: (props: goMtmQueryFnProps) => Promise<any>;
 export declare const ssrGetBackendUrl: () => string;
 export declare const gomtmApiUrl: () => string;
 export declare function createMtmServiceClient<T extends ServiceType>(service: T, url?: string): import("@connectrpc/connect").PromiseClient<T>;

package/dist/esm/mtmFetcher.js

@@ -34,9 +34,10 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+import { toPlainMessage } from "@bufbuild/protobuf";
 import { createPromiseClient } from "@connectrpc/connect";
 import { createConnectTransport } from "@connectrpc/connect-web";
-import { merge } from "lodash";
+import { camelCase, merge } from "lodash";
 import { fetchMiddleWithCache } from "mtxlib/http/fetchMiddleWithCache";
 import { MTM_API_PREFIX } from "./consts";
 import { MtmService } from "./gomtmpb/mtm/sppb/mtm_connect";
@@ -45,8 +46,23 @@ const createQueryKey = (svc, method, input) => {
   return [svc, method, input || {}];
 };
 const createInfiniteQueryKey = (svc, method, input) => {
-  return [svc, method, input || {}, "infinite"];
+  return [...createQueryKey(svc, method, input), "infinite"];
 };
+const goMtmQueryFn = (props) => __async(void 0, null, function* () {
+  var _a;
+  const client = createMtmServiceClientByName(props.svc, (_a = props.options) == null ? void 0 : _a.url);
+  if (!client) {
+    throw new Error(`missing mtmclient:"${props.svc}"`);
+  }
+  const methodName = camelCase(props.method);
+  const methodFn = client[methodName];
+  if (!methodFn) {
+    throw new Error(`missing mtmclient method:"${props.svc}.${methodName}"`);
+  }
+  const data = yield methodFn(props.input);
+  console.log(`goMtmQueryFn ${props.svc}.${props.method}.(${props.input})`, data);
+  return toPlainMessage(data);
+});
 const ssrGetBackendUrl = () => {
   var _a;
   if (typeof window == "undefined") {
@@ -157,6 +173,7 @@ export {
   createMtmServiceClientByName,
   createQueryKey,
   createTransport,
+  goMtmQueryFn,
   gomtmApiUrl,
   gomtmFetcher,
   ssrGetBackendUrl