@dsh-plus/image-studio 0.1.7 → 0.1.9

package/lib/client.js

@@ -338,28 +338,24 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region ../shared/src/client/fetch.ts
-		/**
-		* 同源自定义端点的最小 fetch 封装（各插件 client/api.ts 的公共收编版）。
-		* 仅同源（credentials: same-origin），错误统一抛 Error(body.error)。
-		* @module @dsh-plus/shared/client/fetch
-		*/
-		async function parse(res) {
+		async function parse(res, guard) {
 			const body = await res.json();
 			if (!res.ok) throw new Error(body.error ?? `HTTP ${res.status}`);
+			if (guard !== void 0 && !guard(body)) throw new Error(`响应结构不符合预期（${res.url}）`);
 			return body;
 		}
 		/** GET 同源 JSON 端点。 */
-		async function getJson(route) {
-			return parse(await fetch(route, { credentials: "same-origin" }));
+		async function getJson(route, guard) {
+			return parse(await fetch(route, { credentials: "same-origin" }), guard);
 		}
 		/** POST 同源 JSON 端点（body 可省略）。 */
-		async function postJson(route, body) {
+		async function postJson(route, body, guard) {
 			return parse(await fetch(route, {
 				method: "POST",
 				credentials: "same-origin",
 				headers: { "content-type": "application/json" },
-				body: body === void 0 ? void 0 : JSON.stringify(body)
-			}));
+				...body === void 0 ? {} : { body: JSON.stringify(body) }
+			}), guard);
 		}
 		//#endregion
 		//#region ../shared/src/client/fields.tsx
@@ -929,9 +925,14 @@ ${extra}
 		function cancelTask(taskId) {
 			return postJson(`${BASE}/tasks/${taskId}/cancel`);
 		}
+		/** 画廊列表应答形状守卫：items 需为数组（渲染期直接 map）。 */
+		function isGalleryList(value) {
+			if (typeof value !== "object" || value === null) return false;
+			return Array.isArray(value.items);
+		}
 		/** 画廊列表。 */
 		function fetchGallery() {
-			return getJson(`${BASE}/gallery`);
+			return getJson(`${BASE}/gallery`, isGalleryList);
 		}
 		/** 删除画廊条目。 */
 		function deleteGalleryItem(itemId) {
@@ -2616,6 +2617,14 @@ ${extra}
 		function presetId(prefix) {
 			return `${prefix}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 6)}`;
 		}
+		/** 单选上传结果 → 遮罩引用（无成功条目时保持原值）。 */
+		function uploadRef(entries) {
+			const first = entries[0];
+			return first === void 0 ? null : {
+				kind: "upload",
+				id: first.id
+			};
+		}
 		function GeneratorForm(props) {
 			const { t, endpoint, catalog, protocols, presets, gallery, scope, api } = props;
 			const [providerId, setProviderId] = (0, react.useState)("");
@@ -2980,40 +2989,52 @@ ${extra}
 										className: "ims-hint",
 										children: t("sources.count").replace("{n}", String(sources.length))
 									}),
-									uploads.error !== null ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
-										className: "ims-status ims-statusError",
-										role: "alert",
-										children: [t("upload.failed"), uploads.error]
-									}) : null,
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", {
 										className: "ims-blockTitle",
 										children: t("sources.mask")
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 										className: "ims-sources",
-										children: [mask !== null ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-											className: "ims-thumb",
-											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("img", {
-												src: refUrl(mask),
-												alt: ""
-											}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+										children: [
+											mask !== null ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+												className: "ims-thumb",
+												children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("img", {
+													src: refUrl(mask),
+													alt: ""
+												}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+													type: "button",
+													className: "ims-thumbRemove",
+													"aria-label": t("sources.maskClear"),
+													onClick: () => setMask(null),
+													children: "×"
+												})]
+											}) : null,
+											/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 												type: "button",
-												className: "ims-thumbRemove",
-												"aria-label": t("sources.maskClear"),
-												onClick: () => setMask(null),
-												children: "×"
-											})]
-										}) : null, /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
-											type: "button",
-											className: "ims-thumbAdd",
-											onClick: () => setPicker("mask"),
-											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconLayers, { size: 18 }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("sources.maskPick") })]
-										})]
+												className: "ims-thumbAdd",
+												onClick: () => setPicker("mask"),
+												children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IconLayers, { size: 18 }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("sources.maskPick") })]
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(UploadButton, {
+												t,
+												uploads,
+												multiple: false,
+												accept: "image/png",
+												className: "ims-thumbAdd",
+												onUploaded: (entries) => setMask(uploadRef(entries)),
+												children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconPlusOutline16, { size: 18 }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("upload.pick") })]
+											})
+										]
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 										className: "ims-hint",
 										children: t("sources.maskHint")
-									})
+									}),
+									uploads.error !== null ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
+										className: "ims-status ims-statusError",
+										role: "alert",
+										children: [t("upload.failed"), uploads.error]
+									}) : null
 								]
 							}) : null
 						]

package/lib/index.d.ts

@@ -1,26 +1,6 @@
 import z from "@deepseek-ai/schemastery";
 import { Context, Service } from "@deepseek-ai/cordis";
 //#region src/config.d.ts
-declare const Config: z<Schemastery.ObjectS<{
-  promptPresets: z<unknown[], any[]>;
-  paramPresets: z<unknown[], any[]>;
-  providerPresets: z<unknown[], any[]>;
-  maxConcurrent: z<number, number>;
-  requestTimeoutMs: z<number, number>;
-  proxy: z<string, string>;
-  galleryMaxItems: z<number, number>;
-  uploadTtlHours: z<number, number>;
-}>, Schemastery.ObjectT<{
-  promptPresets: z<unknown[], any[]>;
-  paramPresets: z<unknown[], any[]>;
-  providerPresets: z<unknown[], any[]>;
-  maxConcurrent: z<number, number>;
-  requestTimeoutMs: z<number, number>;
-  proxy: z<string, string>;
-  galleryMaxItems: z<number, number>;
-  uploadTtlHours: z<number, number>;
-}>>;
-type ImageStudioConfig = Schemastery.TypeT<typeof Config>;
 /** 提示词预设（解析后视图）。 */
 interface PromptPresetEntry {
   id: string;
@@ -44,6 +24,26 @@ interface ProviderPresetEntry {
   credentialRef: string;
   extraHeaders: Record<string, string>;
 }
+declare const Config: z<Schemastery.ObjectS<{
+  promptPresets: z<PromptPresetEntry[], PromptPresetEntry[]>;
+  paramPresets: z<ParamPresetEntry[], ParamPresetEntry[]>;
+  providerPresets: z<ProviderPresetEntry[], ProviderPresetEntry[]>;
+  maxConcurrent: z<number, number>;
+  requestTimeoutMs: z<number, number>;
+  proxy: z<string, string>;
+  galleryMaxItems: z<number, number>;
+  uploadTtlHours: z<number, number>;
+}>, Schemastery.ObjectT<{
+  promptPresets: z<PromptPresetEntry[], PromptPresetEntry[]>;
+  paramPresets: z<ParamPresetEntry[], ParamPresetEntry[]>;
+  providerPresets: z<ProviderPresetEntry[], ProviderPresetEntry[]>;
+  maxConcurrent: z<number, number>;
+  requestTimeoutMs: z<number, number>;
+  proxy: z<string, string>;
+  galleryMaxItems: z<number, number>;
+  uploadTtlHours: z<number, number>;
+}>>;
+type ImageStudioConfig = Schemastery.TypeT<typeof Config>;
 //#endregion
 //#region src/provider/types.d.ts
 /**
@@ -320,7 +320,7 @@ declare function credentialRefNameOf(presetId: string): string;
  * @module image-studio/errors
  */
 /** 全部错误码（封闭集合，新增协议/端点行为时按需扩充）。 */
-declare const ERROR_CODES: readonly ["unknown-protocol", "unknown-endpoint", "invalid-request", "unknown-source", "unknown-task", "task-not-runnable", "credential-unavailable", "settings-unavailable", "unsupported-media", "upload-too-large", "provider-error"];
+declare const ERROR_CODES: readonly ['unknown-protocol', 'unknown-endpoint', 'invalid-request', 'unknown-source', 'unknown-task', 'task-not-runnable', 'credential-unavailable', 'settings-unavailable', 'unsupported-media', 'upload-too-large', 'provider-error'];
 type ErrorCode = (typeof ERROR_CODES)[number];
 declare class ImageStudioError extends Error {
   readonly code: ErrorCode;
@@ -474,7 +474,7 @@ declare function validateParamSpecs(specs: unknown): ParamSpecMap;
 //#endregion
 //#region src/index.d.ts
 declare const name = "dsh-plus-image-studio";
-declare const inject: readonly ["credentials"];
+declare const inject: readonly ['credentials'];
 declare module '@deepseek-ai/cordis' {
   interface Context {
     imageStudio: ImageStudioService;

package/lib/index.js

@@ -27,7 +27,7 @@ const PromptPreset = z.object({
 const ParamPreset = z.object({
 	id: z.string().required().description("预设 id"),
 	name: z.string().required().description("预设名称"),
-	endpoint: z.string().required().description("适用端点：generation | edit"),
+	endpoint: z.union([z.const("generation"), z.const("edit")]).required().description("适用端点：generation | edit"),
 	/** 参数表结构由 params/spec 校验，settings 层存原始 JSON。 */
 	paramSpecs: z.any().required().description("参数开关表（ParamSpecMap JSON）")
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/image-studio",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "dsh-plus service+ui plugin: 图像工作室——OpenAI Images 协议文生图/图生图，全参数开关化，双预设体系，并发生图任务与可二次编辑画廊",
   "type": "module",
   "main": "lib/index.js",
@@ -20,7 +20,7 @@
   ],
   "dependencies": {
     "https-proxy-agent": "^9.1.0",
-    "@dsh-plus/shared": "0.1.15"
+    "@dsh-plus/shared": "0.1.16"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",

package/src/client/api.ts

@@ -38,9 +38,15 @@ export function cancelTask(taskId: string): Promise<{ ok: boolean }> {
   return postJson(`${BASE}/tasks/${taskId}/cancel`)
 }
 
+/** 画廊列表应答形状守卫：items 需为数组（渲染期直接 map）。 */
+function isGalleryList(value: unknown): value is GalleryListWire {
+  if (typeof value !== 'object' || value === null) return false
+  return Array.isArray((value as { items?: unknown }).items)
+}
+
 /** 画廊列表。 */
 export function fetchGallery(): Promise<GalleryListWire> {
-  return getJson(`${BASE}/gallery`)
+  return getJson(`${BASE}/gallery`, isGalleryList)
 }
 
 /** 画廊条目详情（含参数回放）。 */

package/src/client/panel/generator.tsx

@@ -15,7 +15,13 @@ import {
   type Scope,
 } from '@dsh-plus/shared/client'
 import { type ReactElement, useEffect, useMemo, useRef, useState } from 'react'
-import type { GenerateRequest, PresetsWire, ProvidersWire, SourceRef } from '../../dto.ts'
+import type {
+  GenerateRequest,
+  PresetsWire,
+  ProvidersWire,
+  SourceRef,
+  UploadEntry,
+} from '../../dto.ts'
 import type { GalleryItem } from '../../gallery/store.ts'
 import { MAX_SOURCE_IMAGES } from '../../limits.ts'
 import type { ParamEntry } from '../../params/catalog.ts'
@@ -66,6 +72,12 @@ function presetId(prefix: string): string {
   return `${prefix}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 6)}`
 }
 
+/** 单选上传结果 → 遮罩引用（无成功条目时保持原值）。 */
+function uploadRef(entries: UploadEntry[]): SourceRef | null {
+  const first = entries[0]
+  return first === undefined ? null : { kind: 'upload', id: first.id }
+}
+
 export function GeneratorForm(props: GeneratorProps): ReactElement {
   const { t, endpoint, catalog, protocols, presets, gallery, scope, api } = props
   const [providerId, setProviderId] = useState('')
@@ -433,12 +445,6 @@ export function GeneratorForm(props: GeneratorProps): ReactElement {
               </UploadButton>
             </div>
             <p className="ims-hint">{t('sources.count').replace('{n}', String(sources.length))}</p>
-            {uploads.error !== null ? (
-              <p className="ims-status ims-statusError" role="alert">
-                {t('upload.failed')}
-                {uploads.error}
-              </p>
-            ) : null}
             <h3 className="ims-blockTitle">{t('sources.mask')}</h3>
             <div className="ims-sources">
               {mask !== null ? (
@@ -458,8 +464,26 @@ export function GeneratorForm(props: GeneratorProps): ReactElement {
                 <IconLayers size={18} />
                 <span>{t('sources.maskPick')}</span>
               </button>
+              <UploadButton
+                t={t}
+                uploads={uploads}
+                multiple={false}
+                // 遮罩必须 PNG（官方要求带透明通道），文件选择器先行收窄。
+                accept="image/png"
+                className="ims-thumbAdd"
+                onUploaded={(entries) => setMask(uploadRef(entries))}
+              >
+                <IconPlusOutline16 size={18} />
+                <span>{t('upload.pick')}</span>
+              </UploadButton>
             </div>
             <p className="ims-hint">{t('sources.maskHint')}</p>
+            {uploads.error !== null ? (
+              <p className="ims-status ims-statusError" role="alert">
+                {t('upload.failed')}
+                {uploads.error}
+              </p>
+            ) : null}
           </section>
         ) : null}
       </div>

package/src/client/panel/uploads.tsx

@@ -77,10 +77,13 @@ interface UploadButtonProps {
   onUploaded(entries: UploadEntry[]): void
   /** 允许多选（源图）或单选（遮罩）。 */
   multiple: boolean
-  /** 允许的文件类型（缺省四类位图；遮罩场景传 image/png）。 */
-  accept?: string
-  disabled?: boolean
-  className?: string
+  /**
+   * 允许的文件类型（缺省四类位图；遮罩场景传 image/png）。
+   * 并上 undefined：调用方按 `multiple ? undefined : 'image/png'` 直接透传。
+   */
+  accept?: string | undefined
+  disabled?: boolean | undefined
+  className?: string | undefined
   children: ReactNode
 }
 

package/src/config.ts

@@ -12,26 +12,56 @@ import { SETTINGS_NS as NS_LITERAL } from './ns.ts'
 /** settings 命名空间（字面量即合法命名空间，编译期校验）。 */
 export const SETTINGS_NS = NS_LITERAL
 
-// dts 可移植性：嵌套 schema 精确类型经 TypeT 消费，显式断掉推断链
-// （同 usage-panel/config 的既有约定）。
-/* biome-ignore lint/suspicious/noExplicitAny: 嵌套 schema 的 dts 可移植性 */
-const PromptPreset: any = z.object({
+/** 提示词预设（解析后视图）。 */
+export interface PromptPresetEntry {
+  id: string
+  name: string
+  text: string
+}
+
+/** 参数预设（解析后视图）。 */
+export interface ParamPresetEntry {
+  id: string
+  name: string
+  endpoint: 'generation' | 'edit'
+  paramSpecs: unknown
+}
+
+/** 提供商预设（解析后视图）。 */
+export interface ProviderPresetEntry {
+  id: string
+  name: string
+  protocol: string
+  baseUrl: string
+  model: string
+  credentialRef: string
+  extraHeaders: Record<string, string>
+}
+
+// 显式标注而非 `any`：z.object() 推断类型含 cosmokit 的 `& Dict` 索引签名，
+// 直接导出会触发 TS2883（inferred type cannot be named / not portable）并使
+// tsdown 的 dts 生成失败。标注成具名契约后既保住类型、又让产物可移植——
+// 退回 `any` 会让三个预设数组元素全部退化为 any。
+const PromptPreset: z<PromptPresetEntry, PromptPresetEntry> = z.object({
   id: z.string().required().description('预设 id（稳定标识，删除级联引用）'),
   name: z.string().required().description('预设名称'),
   text: z.string().required().description('提示词模板'),
 })
 
-/* biome-ignore lint/suspicious/noExplicitAny: 嵌套 schema 的 dts 可移植性 */
-const ParamPreset: any = z.object({
+const ParamPreset: z<ParamPresetEntry, ParamPresetEntry> = z.object({
   id: z.string().required().description('预设 id'),
   name: z.string().required().description('预设名称'),
-  endpoint: z.string().required().description('适用端点：generation | edit'),
+  // 用字面量联合而非 z.string()：endpoint 只有两个合法取值，收窄后与
+  // ParamPresetEntry['endpoint'] 对齐，拼错端点会在编译期暴露。
+  endpoint: z
+    .union([z.const('generation'), z.const('edit')])
+    .required()
+    .description('适用端点：generation | edit'),
   /** 参数表结构由 params/spec 校验，settings 层存原始 JSON。 */
   paramSpecs: z.any().required().description('参数开关表（ParamSpecMap JSON）'),
 })
 
-/* biome-ignore lint/suspicious/noExplicitAny: 嵌套 schema 的 dts 可移植性 */
-const ProviderPreset: any = z.object({
+const ProviderPreset: z<ProviderPresetEntry, ProviderPresetEntry> = z.object({
   id: z.string().required().description('预设 id'),
   name: z.string().required().description('预设名称'),
   protocol: z.string().required().description('协议 id（如 openai-images）'),
@@ -68,29 +98,3 @@ export const Config = z.object({
 })
 
 export type ImageStudioConfig = Schemastery.TypeT<typeof Config>
-
-/** 提示词预设（解析后视图）。 */
-export interface PromptPresetEntry {
-  id: string
-  name: string
-  text: string
-}
-
-/** 参数预设（解析后视图）。 */
-export interface ParamPresetEntry {
-  id: string
-  name: string
-  endpoint: 'generation' | 'edit'
-  paramSpecs: unknown
-}
-
-/** 提供商预设（解析后视图）。 */
-export interface ProviderPresetEntry {
-  id: string
-  name: string
-  protocol: string
-  baseUrl: string
-  model: string
-  credentialRef: string
-  extraHeaders: Record<string, string>
-}

package/src/service.ts

@@ -126,11 +126,11 @@ export class ImageStudioService extends Service {
   }
 
   private paramPresets(): ParamPresetEntry[] {
-    return this.current().paramPresets as ParamPresetEntry[]
+    return this.current().paramPresets
   }
 
   private providerPresets(): ProviderPresetEntry[] {
-    return this.current().providerPresets as ProviderPresetEntry[]
+    return this.current().providerPresets
   }
 
   /** 预设快照（端点投影）。 */