@arronqzy/react-blueprint 1.0.23 → 1.0.24

package/index.ts

@@ -56,6 +56,7 @@ export {
   getApiCollectionById,
   getApiCollectionListItems,
   upsertApiCollectionFromJson,
+  putApiCollection,
   removeApiCollection,
   deleteApiCollection,
   clearApiCollections,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arronqzy/react-blueprint",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "description": "",
   "files": [
     "index.ts",
@@ -18,10 +18,10 @@
     "dayjs": "^1.11.13",
     "react-dom": "^19",
     "@xyflow/react": "^12.9.3",
-    "@arronqzy/blueprint-dsl": "1.0.17",
-    "@arronqzy/i18n": "0.1.17",
     "@arronqzy/react-rx-store": "1.1.8",
-    "@arronqzy/ui": "1.0.10"
+    "@arronqzy/ui": "1.0.10",
+    "@arronqzy/blueprint-dsl": "1.0.17",
+    "@arronqzy/i18n": "0.1.17"
   },
   "devDependencies": {
     "@types/react": "^19.0.1",
@@ -34,8 +34,8 @@
     "eslint": "^8.57.0",
     "typescript": "^5.5.4",
     "vite": "^5.1.4",
-    "@arronqzy/tailwind": "1.0.2",
     "@arronqzy/eslint-config": "0.0.0",
+    "@arronqzy/tailwind": "1.0.2",
     "@arronqzy/typescript-config": "1.0.0"
   },
   "keywords": [],

package/src/library/api-collection-store.ts

@@ -70,18 +70,48 @@ export type UpsertApiCollectionInput = {
   persistLocal: boolean;
   /** 未写 document.name 时用文件名 */
   fallbackName?: string;
+  /** 省略时写入当前已 hydrate 的 nameSpace */
+  nameSpace?: string | null;
 };
 
 export type UpsertApiCollectionResult =
   | { ok: true; record: ApiCollectionRecord }
   | { ok: false; error: string };
 
+function isCurrentNameSpace(nameSpace?: string | null): boolean {
+  return normalizeAppNameSpace(nameSpace) === normalizeAppNameSpace(nameSpaceRef);
+}
+
+/** 写入接口集合；persistLocal 时落 IndexedDB，同一 nameSpace 下刷新内存列表 */
+export async function putApiCollection(
+  record: ApiCollectionRecord,
+  nameSpace?: string | null
+): Promise<ApiCollectionRecord> {
+  if (record.persistLocal) {
+    await putApiCollectionRecord(record, nameSpace);
+  } else if (isCurrentNameSpace(nameSpace)) {
+    const existing = records.find((item) => item.id === record.id);
+    if (existing?.persistLocal) {
+      await deleteApiCollectionRecord(record.id, nameSpace);
+    }
+  }
+  if (isCurrentNameSpace(nameSpace)) {
+    const next = records.filter((item) => item.id !== record.id);
+    next.push(record);
+    records = sortRecords(next);
+    emit();
+  }
+  return record;
+}
+
 export async function upsertApiCollectionFromJson(
   input: UpsertApiCollectionInput
 ): Promise<UpsertApiCollectionResult> {
   const parsed = parseApiCollectionJson(input.rawJson);
   if (!parsed.ok) return parsed;
 
+  const targetNameSpace =
+    input.nameSpace !== undefined ? input.nameSpace : nameSpaceRef;
   const document: ApiCollectionDocument = {
     ...parsed.document,
     name:
@@ -90,11 +120,18 @@ export async function upsertApiCollectionFromJson(
       parsed.document.name,
   };
   const now = Date.now();
-  const existing = input.id
+  const existingInMemory = input.id
     ? records.find((item) => item.id === input.id) ?? null
     : null;
+  const existingPersisted =
+    input.id && !isCurrentNameSpace(targetNameSpace)
+      ? await listApiCollectionRecords(targetNameSpace).then(
+          (list) => list.find((item) => item.id === input.id) ?? null
+        )
+      : null;
+  const existing = existingInMemory ?? existingPersisted;
   const record: ApiCollectionRecord = {
-    id: existing?.id ?? createApiCollectionId(),
+    id: existing?.id ?? input.id ?? createApiCollectionId(),
     name: document.name,
     persistLocal: input.persistLocal,
     document,
@@ -103,16 +140,7 @@ export async function upsertApiCollectionFromJson(
     updatedAt: now,
   };
 
-  if (record.persistLocal) {
-    await putApiCollectionRecord(record, nameSpaceRef);
-  } else if (existing?.persistLocal) {
-    await deleteApiCollectionRecord(record.id, nameSpaceRef);
-  }
-
-  const next = records.filter((item) => item.id !== record.id);
-  next.push(record);
-  records = sortRecords(next);
-  emit();
+  await putApiCollection(record, targetNameSpace);
   return { ok: true, record };
 }
 
@@ -129,10 +157,6 @@ export async function removeApiCollection(id: string): Promise<void> {
   emit();
 }
 
-function isCurrentNameSpace(nameSpace?: string | null): boolean {
-  return normalizeAppNameSpace(nameSpace) === normalizeAppNameSpace(nameSpaceRef);
-}
-
 /** 按 nameSpace 删除接口集合；若该 nameSpace 正在被编辑器使用，内存列表同步移除 */
 export async function deleteApiCollection(
   id: string,