mtmsdk 0.0.51 → 0.0.52

package/src/supabase/schema/index.ts

@@ -1,25 +1,25 @@
-import z from "zod";
-
-const singleRowPreprocessor = (val: unknown) => {
-  if (Array.isArray(val)) {
-    if (val.length === 0) return null;
-    if (val.length === 1) return val[0];
-  }
-  return val;
-};
-
-export const domainConfigSchema = z.preprocess(
-  singleRowPreprocessor,
-  z
-    .object({
-      primary_domain: z.string().min(1, "主域名不能为空"),
-      worker_subdomain_prefix: z.string().optional().default(""),
-    })
-    .nullable(),
-);
-
-
-export const smsProviderConfigSchema = z.object({
-  default_provider: z.enum(["manual", "demo"]).optional().default("manual"),
-});
-
+import z from "zod";
+
+const singleRowPreprocessor = (val: unknown) => {
+  if (Array.isArray(val)) {
+    if (val.length === 0) return null;
+    if (val.length === 1) return val[0];
+  }
+  return val;
+};
+
+export const domainConfigSchema = z.preprocess(
+  singleRowPreprocessor,
+  z
+    .object({
+      primary_domain: z.string().min(1, "主域名不能为空"),
+      worker_subdomain_prefix: z.string().optional().default(""),
+    })
+    .nullable(),
+);
+
+
+export const smsProviderConfigSchema = z.object({
+  default_provider: z.enum(["manual", "demo"]).optional().default("manual"),
+});
+

package/src/supabase/supabase-client.ts

@@ -1,30 +1,30 @@
-import { createServerClient } from "@supabase/ssr";
-import type { cookies } from "next/headers";
-import type { Database } from "../types/database.types";
-
-export function useSupabaseServer(
-	cookieStore: Awaited<ReturnType<typeof cookies>>,
-) {
-	return createServerClient<Database>(
-		process.env.NEXT_PUBLIC_SUPABASE_URL!,
-		process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
-		{
-			cookies: {
-				getAll() {
-					return cookieStore.getAll();
-				},
-				setAll(cookiesToSet) {
-					try {
-						for (const co of cookiesToSet) {
-							cookieStore.set(co.name, co.value, co.options);
-						}
-					} catch (e) {
-						//!!! 提示,对于nextjs + honoapi 后端方式使用,可能出现以下错误:
-						// Cookies can only be modified in a Server Action or Route Handler. Read more: https://nextjs.org/docs/app/api-reference/functions/cookies#options
-						//可以直接忽略.
-					}
-				},
-			},
-		},
-	);
-}
+import { createServerClient } from "@supabase/ssr";
+import type { cookies } from "next/headers";
+import type { Database } from "../types/database.types";
+
+export function useSupabaseServer(
+	cookieStore: Awaited<ReturnType<typeof cookies>>,
+) {
+	return createServerClient<Database>(
+		process.env.NEXT_PUBLIC_SUPABASE_URL!,
+		process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
+		{
+			cookies: {
+				getAll() {
+					return cookieStore.getAll();
+				},
+				setAll(cookiesToSet) {
+					try {
+						for (const co of cookiesToSet) {
+							cookieStore.set(co.name, co.value, co.options);
+						}
+					} catch (e) {
+						//!!! 提示,对于nextjs + honoapi 后端方式使用,可能出现以下错误:
+						// Cookies can only be modified in a Server Action or Route Handler. Read more: https://nextjs.org/docs/app/api-reference/functions/cookies#options
+						//可以直接忽略.
+					}
+				},
+			},
+		},
+	);
+}

package/src/supabase/supabase.ts

@@ -1,67 +1,67 @@
-import { createServerClient, parseCookieHeader } from "@supabase/ssr";
-import { createClient } from "@supabase/supabase-js";
-import type { Context } from "hono";
-import { setCookie } from "hono/cookie";
-import type { TypedSupabaseClient } from "../types";
-import type { Database } from "../types/database.types";
-
-export const getSupabaseUrl = () => {
-  if (!process.env.NEXT_PUBLIC_SUPABASE_URL) {
-    throw new Error("NEXT_PUBLIC_SUPABASE_URL missing!");
-  }
-  return process.env.NEXT_PUBLIC_SUPABASE_URL;
-};
-export const getSupabasePublicKey = () => {
-  if (!process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY) {
-    throw new Error("NEXT_PUBLIC_SUPABASE_ANON_KEY missing!");
-  }
-  return process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY;
-};
-
-export const getSupabaseProjectRef = () => {
-  const uri = new URL(getSupabaseUrl());
-  const supabasePrject = uri.hostname.split(".")[0];
-  return supabasePrject;
-};
-
-export const getSupabase = (c: Context) => {
-  const client: TypedSupabaseClient = createServerClient<Database, "public">(getSupabaseUrl(), getSupabasePublicKey(), {
-    cookies: {
-      //@ts-expect-error
-      getAll() {
-        return parseCookieHeader(c.req.header("Cookie") ?? "");
-      },
-      setAll(cookiesToSet) {
-        for (const co of cookiesToSet) {
-          //@ts-expect-error
-          setCookie(c, co.name, co.value, co.options);
-        }
-      },
-    },
-    global: {
-      // 由于gomtm supabase 客户端已经登录.所以这里直接传递 Authorization 头,即可.
-      headers: {
-        ...(c.req.header("Authorization") && {
-          Authorization: c.req.header("Authorization"),
-        }),
-      },
-    },
-  });
-
-  return client;
-};
-
-export const getSupabaseAdmin = () => {
-  const serviceRoleKey = process.env.SUPABASE_SERVICE_ROLE_KEY;
-  if (!serviceRoleKey) {
-    throw new Error("require SUPABASE_SERVICE_ROLE_KEY");
-  }
-  const client: TypedSupabaseClient = createClient<Database, "public">(getSupabaseUrl(), serviceRoleKey, {
-    auth: {
-      autoRefreshToken: false,
-      persistSession: false,
-    },
-  });
-
-  return client;
-};
+import { createServerClient, parseCookieHeader } from "@supabase/ssr";
+import { createClient } from "@supabase/supabase-js";
+import type { Context } from "hono";
+import { setCookie } from "hono/cookie";
+import type { TypedSupabaseClient } from "../types";
+import type { Database } from "../types/database.types";
+
+export const getSupabaseUrl = () => {
+  if (!process.env.NEXT_PUBLIC_SUPABASE_URL) {
+    throw new Error("NEXT_PUBLIC_SUPABASE_URL missing!");
+  }
+  return process.env.NEXT_PUBLIC_SUPABASE_URL;
+};
+export const getSupabasePublicKey = () => {
+  if (!process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY) {
+    throw new Error("NEXT_PUBLIC_SUPABASE_ANON_KEY missing!");
+  }
+  return process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY;
+};
+
+export const getSupabaseProjectRef = () => {
+  const uri = new URL(getSupabaseUrl());
+  const supabasePrject = uri.hostname.split(".")[0];
+  return supabasePrject;
+};
+
+export const getSupabase = (c: Context) => {
+  const client: TypedSupabaseClient = createServerClient<Database, "public">(getSupabaseUrl(), getSupabasePublicKey(), {
+    cookies: {
+      //@ts-expect-error
+      getAll() {
+        return parseCookieHeader(c.req.header("Cookie") ?? "");
+      },
+      setAll(cookiesToSet) {
+        for (const co of cookiesToSet) {
+          //@ts-expect-error
+          setCookie(c, co.name, co.value, co.options);
+        }
+      },
+    },
+    global: {
+      // 由于gomtm supabase 客户端已经登录.所以这里直接传递 Authorization 头,即可.
+      headers: {
+        ...(c.req.header("Authorization") && {
+          Authorization: c.req.header("Authorization"),
+        }),
+      },
+    },
+  });
+
+  return client;
+};
+
+export const getSupabaseAdmin = () => {
+  const serviceRoleKey = process.env.SUPABASE_SERVICE_ROLE_KEY;
+  if (!serviceRoleKey) {
+    throw new Error("require SUPABASE_SERVICE_ROLE_KEY");
+  }
+  const client: TypedSupabaseClient = createClient<Database, "public">(getSupabaseUrl(), serviceRoleKey, {
+    auth: {
+      autoRefreshToken: false,
+      persistSession: false,
+    },
+  });
+
+  return client;
+};

package/src/supabase/use-sb-query/build-query-opts.ts

@@ -1,56 +1,68 @@
-import {
-  type AnyPostgrestResponse,
-  isPostgrestBuilder,
-  isPostgrestTransformBuilder,
-} from "@supabase-cache-helpers/postgrest-core";
-import type { PostgrestError } from "@supabase/postgrest-js";
-import type {
-  UseQueryOptions as UseReactQueryOptions,
-  UseSuspenseQueryOptions,
-} from "@tanstack/react-query";
-
-import { encode } from "./key";
-
-export function buildQueryOpts<Result>(
-	query: PromiseLike<AnyPostgrestResponse<Result>>,
-	config?: Omit<
-		UseReactQueryOptions<AnyPostgrestResponse<Result>, PostgrestError>,
-		"queryKey" | "queryFn"
-	>,
-): UseReactQueryOptions<AnyPostgrestResponse<Result>, PostgrestError> {
-	return {
-		queryKey: encode<Result>(query, false),
-		queryFn: async ({ signal }) => {
-			if (isPostgrestTransformBuilder(query)) {
-				query = query.abortSignal(signal);
-			}
-			if (isPostgrestBuilder(query)) {
-				query = query.throwOnError();
-			}
-			return await query;
-		},
-		...config,
-	};
-}
-
-export function buildSuspenseQueryOpts<Result>(
-	query: PromiseLike<AnyPostgrestResponse<Result>>,
-	config?: Omit<
-		UseSuspenseQueryOptions<AnyPostgrestResponse<Result>, PostgrestError>,
-		"queryKey" | "queryFn"
-	>,
-): UseSuspenseQueryOptions<AnyPostgrestResponse<Result>, PostgrestError> {
-	return {
-		queryKey: encode<Result>(query, false),
-		queryFn: async ({ signal }) => {
-			if (isPostgrestTransformBuilder(query)) {
-				query = query.abortSignal(signal);
-			}
-			if (isPostgrestBuilder(query)) {
-				query = query.throwOnError();
-			}
-			return await query;
-		},
-		...config,
-	};
-}
+import {
+  type AnyPostgrestResponse,
+  isPostgrestBuilder,
+  isPostgrestTransformBuilder,
+} from "@supabase-cache-helpers/postgrest-core";
+import type { PostgrestError } from "@supabase/postgrest-js";
+import type {
+	UseQueryOptions as UseReactQueryOptions,
+	UseSuspenseQueryOptions,
+} from "@tanstack/react-query";
+
+import { encode } from "./key";
+
+type QueryKeySuffixOption = {
+	queryKeySuffix?: readonly unknown[];
+};
+
+export function buildQueryOpts<Result>(
+	query: PromiseLike<AnyPostgrestResponse<Result>>,
+	config?: Omit<
+		UseReactQueryOptions<AnyPostgrestResponse<Result>, PostgrestError>,
+		"queryKey" | "queryFn"
+	> &
+		QueryKeySuffixOption,
+): UseReactQueryOptions<AnyPostgrestResponse<Result>, PostgrestError> {
+	const { queryKeySuffix, ...reactQueryConfig } = config ?? {};
+	const queryKey = encode<Result>(query, false);
+
+	return {
+		queryKey: queryKeySuffix?.length ? [...queryKey, ...queryKeySuffix] : queryKey,
+		queryFn: async ({ signal }) => {
+			if (isPostgrestTransformBuilder(query)) {
+				query = query.abortSignal(signal);
+			}
+			if (isPostgrestBuilder(query)) {
+				query = query.throwOnError();
+			}
+			return await query;
+		},
+		...reactQueryConfig,
+	};
+}
+
+export function buildSuspenseQueryOpts<Result>(
+	query: PromiseLike<AnyPostgrestResponse<Result>>,
+	config?: Omit<
+		UseSuspenseQueryOptions<AnyPostgrestResponse<Result>, PostgrestError>,
+		"queryKey" | "queryFn"
+	> &
+		QueryKeySuffixOption,
+): UseSuspenseQueryOptions<AnyPostgrestResponse<Result>, PostgrestError> {
+	const { queryKeySuffix, ...reactQueryConfig } = config ?? {};
+	const queryKey = encode<Result>(query, false);
+
+	return {
+		queryKey: queryKeySuffix?.length ? [...queryKey, ...queryKeySuffix] : queryKey,
+		queryFn: async ({ signal }) => {
+			if (isPostgrestTransformBuilder(query)) {
+				query = query.abortSignal(signal);
+			}
+			if (isPostgrestBuilder(query)) {
+				query = query.throwOnError();
+			}
+			return await query;
+		},
+		...reactQueryConfig,
+	};
+}

package/src/supabase/use-sb-query/key.ts

@@ -1,57 +1,57 @@
-import { type DecodedKey, isPostgrestBuilder, PostgrestParser } from "@supabase-cache-helpers/postgrest-core";
-
-export const KEY_PREFIX = "postgrest";
-export const INFINITE_KEY_PREFIX = "page";
-
-export type DecodedReactQueryKey = DecodedKey & {
-  isInfinite: boolean;
-  key: string[];
-};
-
-export const encode = <Result>(key: unknown, isInfinite: boolean): string[] => {
-  if (!isPostgrestBuilder<Result>(key)) {
-    throw new Error("Key is not a PostgrestBuilder");
-  }
-
-  const parser = new PostgrestParser<Result>(key);
-  return [
-    KEY_PREFIX,
-    isInfinite ? INFINITE_KEY_PREFIX : "null",
-    parser.schema,
-    parser.table,
-    parser.queryKey,
-    parser.bodyKey ?? "null",
-    `count=${parser.count}`,
-    `head=${parser.isHead}`,
-    parser.orderByKey,
-  ];
-};
-
-export const decode = (key: unknown): DecodedReactQueryKey | null => {
-  if (!Array.isArray(key)) return null;
-
-  const [prefix, infinitePrefix, schema, table, queryKey, bodyKey, count, head, orderByKey] = key;
-
-  // Exit early if not a postgrest key
-  if (prefix !== KEY_PREFIX) return null;
-
-  const params = new URLSearchParams(queryKey);
-  const limit = params.get("limit");
-  const offset = params.get("offset");
-
-  const countValue = count.replace("count=", "");
-
-  return {
-    limit: limit ? Number(limit) : undefined,
-    offset: offset ? Number(offset) : undefined,
-    bodyKey,
-    count: countValue === "null" ? null : countValue,
-    isHead: head === "head=true",
-    isInfinite: infinitePrefix === INFINITE_KEY_PREFIX,
-    key,
-    queryKey,
-    schema,
-    table,
-    orderByKey,
-  };
-};
+import { type DecodedKey, isPostgrestBuilder, PostgrestParser } from "@supabase-cache-helpers/postgrest-core";
+
+export const KEY_PREFIX = "postgrest";
+export const INFINITE_KEY_PREFIX = "page";
+
+export type DecodedReactQueryKey = DecodedKey & {
+  isInfinite: boolean;
+  key: string[];
+};
+
+export const encode = <Result>(key: unknown, isInfinite: boolean): string[] => {
+  if (!isPostgrestBuilder<Result>(key)) {
+    throw new Error("Key is not a PostgrestBuilder");
+  }
+
+  const parser = new PostgrestParser<Result>(key);
+  return [
+    KEY_PREFIX,
+    isInfinite ? INFINITE_KEY_PREFIX : "null",
+    parser.schema,
+    parser.table,
+    parser.queryKey,
+    parser.bodyKey ?? "null",
+    `count=${parser.count}`,
+    `head=${parser.isHead}`,
+    parser.orderByKey,
+  ];
+};
+
+export const decode = (key: unknown): DecodedReactQueryKey | null => {
+  if (!Array.isArray(key)) return null;
+
+  const [prefix, infinitePrefix, schema, table, queryKey, bodyKey, count, head, orderByKey] = key;
+
+  // Exit early if not a postgrest key
+  if (prefix !== KEY_PREFIX) return null;
+
+  const params = new URLSearchParams(queryKey);
+  const limit = params.get("limit");
+  const offset = params.get("offset");
+
+  const countValue = count.replace("count=", "");
+
+  return {
+    limit: limit ? Number(limit) : undefined,
+    offset: offset ? Number(offset) : undefined,
+    bodyKey,
+    count: countValue === "null" ? null : countValue,
+    isHead: head === "head=true",
+    isInfinite: infinitePrefix === INFINITE_KEY_PREFIX,
+    key,
+    queryKey,
+    schema,
+    table,
+    orderByKey,
+  };
+};