gomtm 0.0.181 → 0.0.182

package/dist/esm/components/blog/PostCard.js

@@ -5,12 +5,13 @@ import { MtLink } from "mtxuilib/common/mtlink";
 import { cn } from "mtxuilib/lib/utils";
 import { useDebug } from "mtxuilib/store/app.atoms";
 import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "mtxuilib/ui/card";
-import { curdActivateIdAtom } from "../../curd/CurdListView";
+import { curdActivateIdAtom, curdDashPathPrefixAtom } from "../../curd/curd.atoms";
 import { BlogPostItemActions } from "./BlogPostActions";
 const PostCard = (props) => {
   const { item } = props;
   const debug = useDebug();
   const [curdActivateId, setcurdActivateId] = useAtom(curdActivateIdAtom);
+  const [dashPrefix] = useAtom(curdDashPathPrefixAtom);
   return /* @__PURE__ */ jsxs(
     Card,
     {
@@ -24,7 +25,7 @@ const PostCard = (props) => {
       },
       children: [
         /* @__PURE__ */ jsxs(CardHeader, { children: [
-          /* @__PURE__ */ jsx(CardTitle, { children: /* @__PURE__ */ jsx(MtLink, { href: `/post/${item.id}`, className: "pb-4 text-3xl font-bold hover:text-gray-700", children: item == null ? void 0 : item.title }) }),
+          /* @__PURE__ */ jsx(CardTitle, { children: /* @__PURE__ */ jsx(MtLink, { href: `${dashPrefix}/post/${item.id}`, className: "pb-4 text-3xl font-bold hover:text-gray-700", children: item == null ? void 0 : item.title }) }),
           /* @__PURE__ */ jsx(CardDescription, { children: "Deploy your new project in one-click." })
         ] }),
         /* @__PURE__ */ jsx(CardContent, { children: /* @__PURE__ */ jsxs("article", { className: "my-4 flex flex-col", children: [

package/dist/esm/consts.d.ts

@@ -12,8 +12,6 @@ export declare const DEFAULT_revalidate_SECONDS = 3;
 export declare const LOGIN_CALLBACK_URL_KEY = "back";
 export declare const ExtKey_Hostname = "host";
 export declare const ExtKey_mtmaccessToken = "access_token";
-export declare const ExtKey_mtmbackend = "mtmbackend";
-export declare const ExtKey_SelfBackend = "selfbackend";
 export declare const ItemAction_list_new_item = "list_new_item";
 export declare const Listview_list_filter = "Listview_list_filter";
 export declare const ActionEdit = "edit";

package/dist/esm/consts.js

@@ -12,8 +12,6 @@ const DEFAULT_revalidate_SECONDS = 3;
 const LOGIN_CALLBACK_URL_KEY = "back";
 const ExtKey_Hostname = "host";
 const ExtKey_mtmaccessToken = "access_token";
-const ExtKey_mtmbackend = "mtmbackend";
-const ExtKey_SelfBackend = "selfbackend";
 const ItemAction_list_new_item = "list_new_item";
 const Listview_list_filter = "Listview_list_filter";
 const ActionEdit = "edit";
@@ -38,9 +36,7 @@ export {
   Cookie_Site_Host,
   DEFAULT_revalidate_SECONDS,
   ExtKey_Hostname,
-  ExtKey_SelfBackend,
   ExtKey_mtmaccessToken,
-  ExtKey_mtmbackend,
   HeaderMtmApi,
   HeaderMtmHost,
   ImageNoExist,

package/dist/esm/curd/CurdListView.d.ts

@@ -1,9 +1,6 @@
 import { AnyMessage, Message, PlainMessage } from "@bufbuild/protobuf";
 import { PropsWithChildren } from "react";
 import { MethodUnaryDescriptor } from "../connectquery";
-export declare const curdActivateIdAtom: import("jotai").PrimitiveAtom<string> & {
-    init: string;
-};
 export declare function Curd3ListProvider<I extends Message<I>, O extends Message<O>>(props: {
     params: Partial<PlainMessage<I>>;
     methodList: MethodUnaryDescriptor<I, O>;

package/dist/esm/curd/CurdListView.js

@@ -28,7 +28,6 @@ import { callUnaryMethod } from "../connectquery";
 import { ListViewLayout } from "../gomtmpb/mtm/sppb/mtm_pb";
 import { gomtmBaseUrlAtom, transportAtom } from "../providers/GomtmProvider";
 import { ListItemView } from "./list-item/ListItem";
-const curdActivateIdAtom = atom("");
 const curd3ListParamsAtom = atom({});
 const curd3MethodListAtom = atom(null);
 const curd3ItemsAtom = atom((get) => __async(void 0, null, function* () {
@@ -94,6 +93,5 @@ export {
   Curd2ListView,
   Curd3ListProvider,
   Curd3ListViewDebug,
-  curdActivateIdAtom,
   useCurd3List
 };

package/dist/esm/curd/CurdListViewAuto.d.ts

@@ -0,0 +1,3 @@
+import { Message } from "@bufbuild/protobuf";
+import { PropsWithChildren } from "react";
+export declare function CurdListViewByPathname<I extends Message<I>, O extends Message<O>>(props: {} & PropsWithChildren): import("react").JSX.Element;

package/dist/esm/curd/CurdListViewAuto.js

@@ -0,0 +1,15 @@
+"use client";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { usePathname } from "next/navigation";
+function CurdListViewByPathname(props) {
+  const { children } = props;
+  const pathname = usePathname();
+  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsxs("h1", { children: [
+    "CurdListViewByPathname(",
+    pathname,
+    ")"
+  ] }) }) });
+}
+export {
+  CurdListViewByPathname
+};

package/dist/esm/curd/CurdListViewV2.d.ts

@@ -0,0 +1,6 @@
+import { PropsWithChildren } from "react";
+export declare function Curd3ListProviderV2(props: {
+    params?: any;
+} & PropsWithChildren): import("react").JSX.Element;
+export declare const Curd2ListViewV2: () => import("react").JSX.Element;
+export declare const Curd3ListProviderV2Debug: () => import("react").JSX.Element;

package/dist/esm/curd/CurdListViewV2.js

@@ -0,0 +1,45 @@
+"use client";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { useAtom } from "jotai";
+import { ScopeProvider } from "mtxlib/jotai/ScopeProvider";
+import { AtomsHydrator } from "mtxlib/jotai/jotai-helper";
+import { usePathname } from "next/navigation";
+import { MtUnaryCallErrorView } from "../components/MtUnaryCallErrorView";
+import { curd3ItemsAtom, curd3ListParamsAtom, curd3MethodListAtom, curdMethodListAtom, curdSvcAtom } from "./curd.atoms";
+import { ListItemView } from "./list-item/ListItem";
+function Curd3ListProviderV2(props) {
+  const { params, children } = props;
+  const [curdMethodList, setcurdMethodList] = useAtom(curdMethodListAtom);
+  const pathName = usePathname();
+  return /* @__PURE__ */ jsx(ScopeProvider, { atoms: [curd3ListParamsAtom, curd3MethodListAtom], children: /* @__PURE__ */ jsxs(AtomsHydrator, { atomValues: [
+    [curd3ListParamsAtom, params],
+    [curd3MethodListAtom, curdMethodList]
+  ], children: [
+    /* @__PURE__ */ jsx(Curd3ListProviderV2Debug, {}),
+    children
+  ] }) });
+}
+const Curd2ListViewV2 = () => {
+  const [res] = useAtom(curd3ItemsAtom);
+  return /* @__PURE__ */ jsx("div", { className: "bg-blue-100 p-2", children: res.errCode ? /* @__PURE__ */ jsx(MtUnaryCallErrorView, { unaryError: res }) : /* @__PURE__ */ jsx(Fragment, { children: res.items.map((item, i) => {
+    return /* @__PURE__ */ jsx(ListItemView, { item }, i);
+  }) }) });
+};
+const Curd3ListProviderV2Debug = () => {
+  const [curdSvc, setCurdSvc] = useAtom(curdSvcAtom);
+  const [curdMethodList, setCurdMethodList] = useAtom(curdMethodListAtom);
+  return /* @__PURE__ */ jsxs("div", { className: "bg-slate-200 p-2", children: [
+    /* @__PURE__ */ jsx("h1", { children: "Curd3ListProviderV2Debug" }),
+    /* @__PURE__ */ jsxs("div", { children: [
+      "method:",
+      curdSvc,
+      ".",
+      curdMethodList
+    ] })
+  ] });
+};
+export {
+  Curd2ListViewV2,
+  Curd3ListProviderV2,
+  Curd3ListProviderV2Debug
+};

package/dist/esm/curd/curd-detail.js

@@ -6,7 +6,7 @@ import { createContext, useMemo, useState } from "react";
 import { Icons } from "mtxuilib/icons/icons";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuGroup, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger } from "mtxuilib/ui/dropdown-menu";
 import { MtButton } from "mtxuilib/ui/ui-mt/Button";
-import { curdActivateIdAtom } from "./CurdListView";
+import { curdActivateIdAtom } from "./curd.atoms";
 const curdDetailViewContext = createContext(void 0);
 function CurdViewDetailProvider(props) {
   const [isOpenEdit, setIsOpenEdit] = useState(false);

package/dist/esm/curd/curd.atoms.d.ts

@@ -0,0 +1,21 @@
+import { AnyMessage, PlainMessage } from "@bufbuild/protobuf";
+import { CommontListRes, MtmError } from "../gomtmpb/mtm/sppb/mtm_pb";
+export declare const curdDashPathPrefixAtom: import("jotai").PrimitiveAtom<string> & {
+    init: string;
+};
+export declare const curdActivateIdAtom: import("jotai").PrimitiveAtom<string> & {
+    init: string;
+};
+export declare const curdSvcAtom: import("jotai").PrimitiveAtom<string> & {
+    init: string;
+};
+export declare const curdMethodListAtom: import("jotai").PrimitiveAtom<string> & {
+    init: string;
+};
+export declare const curd3ListParamsAtom: import("jotai").PrimitiveAtom<PlainMessage<AnyMessage>> & {
+    init: PlainMessage<AnyMessage>;
+};
+export declare const curd3MethodListAtom: import("jotai").PrimitiveAtom<string> & {
+    init: string;
+};
+export declare const curd3ItemsAtom: import("jotai").Atom<Promise<CommontListRes | PlainMessage<MtmError>>>;

package/dist/esm/curd/curd.atoms.js

@@ -0,0 +1,56 @@
+"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 { atom } from "jotai";
+import { createMtmServiceClientByName } from "../gomtm-clients-ss";
+const curdDashPathPrefixAtom = atom("/gomtmadmin");
+const curdActivateIdAtom = atom("");
+const curdSvcAtom = atom("sppb.MtmService");
+const curdMethodListAtom = atom("blogPostList");
+const curd3ListParamsAtom = atom({});
+const curd3MethodListAtom = atom("");
+const curd3ItemsAtom = atom((get) => __async(void 0, null, function* () {
+  const params = get(curd3ListParamsAtom);
+  const methodList = get(curd3MethodListAtom);
+  if (!methodList) {
+    throw new Error("curd3ItemsAtom, missing methodList");
+  }
+  const svcName = get(curdSvcAtom);
+  if (!svcName) {
+    throw new Error(`curd3ItemsAtom, missing svcName:\u201C${svcName}\u201D`);
+  }
+  const client = yield createMtmServiceClientByName(svcName);
+  const methodFn = client[methodList];
+  if (!methodFn) {
+    throw new Error(`missing method ${svcName}.${methodList}`);
+  }
+  const data = yield methodFn(params);
+  return data;
+}));
+export {
+  curd3ItemsAtom,
+  curd3ListParamsAtom,
+  curd3MethodListAtom,
+  curdActivateIdAtom,
+  curdDashPathPrefixAtom,
+  curdMethodListAtom,
+  curdSvcAtom
+};

package/dist/esm/gomtm-clients-ss.d.ts

@@ -1,5 +1,6 @@
 import { ServiceType } from "@bufbuild/protobuf";
 export declare function createMtmServiceClient<T extends ServiceType>(service: T, url?: string): import("@connectrpc/connect").PromiseClient<T>;
+export declare function createMtmServiceClientByName<T extends ServiceType>(svcName: string, url?: string): import("@connectrpc/connect").PromiseClient<ServiceType>;
 type CustomRequestInit = RequestInit & {
     enableCache?: boolean;
     enableLog?: boolean;

package/dist/esm/gomtm-clients-ss.js

@@ -41,6 +41,7 @@ import { createPromiseClient } from "@connectrpc/connect";
 import { createConnectTransport } from "@connectrpc/connect-web";
 import { merge } from "lodash";
 import { fetchMiddleWithCache } from "mtxlib/http/fetchMiddleWithCache";
+import { MtmService } from "./gomtmpb/mtm/sppb/mtm_connect";
 function createMtmServiceClient(service, url) {
   const baseUrl = url || process.env.MTM_BACKEND;
   if (!baseUrl) {
@@ -55,6 +56,30 @@ function createMtmServiceClient(service, url) {
     })
   );
 }
+function createMtmServiceClientByName(svcName, url) {
+  const baseUrl = url || process.env.MTM_BACKEND;
+  if (!baseUrl) {
+    throw new Error("missing mtm api url,\xB7MTM_BACKEND\xB7");
+  }
+  console.info("gomtm baseUrl:", baseUrl);
+  let svcType = void 0;
+  for (const a of allServices) {
+    if (a.typeName == svcName) {
+      svcType = a;
+    }
+  }
+  if (!svcType) {
+    throw new Error(`unknown svcType ${svcName}`);
+  }
+  return createPromiseClient(
+    svcType,
+    createConnectTransport({
+      baseUrl,
+      fetch: gomtmFetcher()
+    })
+  );
+}
+const allServices = [MtmService];
 const gomtmFetcher = (initGlobal) => {
   return (input, init) => __async(void 0, null, function* () {
     if (init) {
@@ -102,5 +127,6 @@ const gomtmFetcher = (initGlobal) => {
 };
 export {
   createMtmServiceClient,
+  createMtmServiceClientByName,
   gomtmFetcher
 };

package/dist/esm/providers/GomtmProvider.d.ts

@@ -1,6 +1,5 @@
-import { Dispatch, PropsWithChildren } from 'react';
+import { PropsWithChildren } from 'react';
 import { Transport } from '@connectrpc/connect';
-import React from 'react';
 export declare const mtmAppStore: {
     get: <Value>(atom: import("jotai").Atom<Value>) => Value;
     set: <Value_1, Args extends unknown[], Result>(atom: import("jotai").WritableAtom<Value_1, Args, Result>, ...args: Args) => Result;
@@ -55,22 +54,11 @@ interface GomtmAppProps {
     backendUrl?: string | null;
 }
 interface IAppContext {
-    token?: string | null;
     hostname?: string | null;
-    isDebug?: boolean;
-    debugData?: any;
-    setDebugData: Dispatch<any>;
-    isOpenDebugView?: boolean;
-    setOpenDebugView: Dispatch<React.SetStateAction<boolean>>;
 }
-export declare function GomtmProvider(props: {} & GomtmAppProps & PropsWithChildren): React.JSX.Element;
+export declare function GomtmProvider(props: {} & GomtmAppProps & PropsWithChildren): import("react").JSX.Element;
 export declare function useMtmApp(): IAppContext & GomtmAppProps;
 export declare const useMtmBackendUrl: () => string | null | undefined;
 export declare const useHostname: () => string;
-export declare const useExtInfo: () => (key: string) => string | null | undefined;
-export declare const useToken: () => {
-    token: string;
-    setToken: (newToken: string) => void;
-};
-export declare const MtConnectProvider: (props: PropsWithChildren) => React.JSX.Element;
+export declare const MtConnectProvider: (props: PropsWithChildren) => import("react").JSX.Element;
 export {};

package/dist/esm/providers/GomtmProvider.js

@@ -1,14 +1,12 @@
 "use client";
 import { Fragment, jsx } from "react/jsx-runtime";
-import { createContext, useCallback, useContext, useState } from "react";
+import { createContext, useContext } from "react";
 import { createConnectTransport } from "@connectrpc/connect-web";
 import { atom, createStore, useAtom } from "jotai";
-import { getCookie } from "mtxlib/clientlib";
 import { AtomsHydrator } from "mtxlib/jotai/jotai-helper";
 import { isDebugAtom } from "mtxuilib/store/app.atoms";
 import { useHotkeys } from "react-hotkeys-hook";
 import { TransportProvider } from "../connectquery";
-import { ExtKey_Hostname, ExtKey_SelfBackend, ExtKey_mtmaccessToken, ExtKey_mtmbackend, MtM_TOKEN_NAME } from "../consts";
 import { gomtmFetcher } from "../gomtm-clients-ss";
 import { MtReactQueryProvider } from "./ReactQueryProvider";
 const mtmAppStore = createStore();
@@ -68,37 +66,6 @@ const useHostname = () => {
   }
   return "";
 };
-const useExtInfo = () => {
-  const backendUrl = useMtmBackendUrl();
-  const siteHost = useHostname();
-  const { token } = useMtmApp();
-  const fn = useCallback((key) => {
-    switch (key) {
-      case ExtKey_mtmbackend:
-        return backendUrl;
-      case ExtKey_Hostname:
-        return siteHost;
-      case ExtKey_mtmaccessToken:
-        return token;
-      case ExtKey_SelfBackend:
-        return;
-      default:
-        throw new Error(`extinfo key error: ${key}`);
-    }
-  }, [backendUrl, siteHost, token]);
-  return fn;
-};
-const useToken = () => {
-  const [token] = useState(typeof window != "undefined" ? getCookie(MtM_TOKEN_NAME) : "");
-  return {
-    token: token || "",
-    setToken: (newToken) => {
-      if (typeof window != "undefined") {
-        document.cookie = `${MtM_TOKEN_NAME}=${newToken}`;
-      }
-    }
-  };
-};
 const MtConnectProvider = (props) => {
   const { children } = props;
   const [transport] = useAtom(transportAtom);
@@ -110,10 +77,8 @@ export {
   gomtmBaseUrlAtom,
   mtmAppStore,
   transportAtom,
-  useExtInfo,
   useGomtmBackend,
   useHostname,
   useMtmApp,
-  useMtmBackendUrl,
-  useToken
+  useMtmBackendUrl
 };

package/dist/esm/providers/logger.context.d.ts

@@ -7,10 +7,4 @@ export declare function useLogger(): {
         (...data: any[]): void;
         (message?: any, ...optionalParams: any[]): void;
     };
-    error: {
-        (...data: any[]): void;
-        (...data: any[]): void;
-        (...data: any[]): void;
-        (message?: any, ...optionalParams: any[]): void;
-    };
 };

package/dist/esm/providers/logger.context.js

@@ -1,8 +1,7 @@
 "use client";
 import { jsx } from "react/jsx-runtime";
 import { mtlogger } from "mtxlib/mt-logger";
-import { createContext, useContext, useMemo, useState } from "react";
-import { useMtmApp } from "./GomtmProvider";
+import { createContext, useContext, useState } from "react";
 const LoggerContext = createContext(void 0);
 function LoggerProvider(props) {
   const { children } = props;
@@ -18,22 +17,7 @@ function useLogger() {
   if (context === void 0) {
     throw new Error("useLogger must be used within a LoggerProvider");
   }
-  const mtapp = useMtmApp();
-  const info = useMemo(() => {
-    if (mtapp.isDebug) {
-      return mtlogger.log;
-    } else {
-      return nonLogFn;
-    }
-  }, [mtapp.isDebug]);
-  const error = useMemo(() => {
-    if (mtapp.isDebug) {
-      return mtlogger.error;
-    } else {
-      return nonLogFn;
-    }
-  }, [mtapp.isDebug]);
-  return { info, error };
+  return { info: mtlogger.log };
 }
 export {
   LoggerProvider,