From b1540e83742398a7919b387a2ec894f875c4db3f Mon Sep 17 00:00:00 2001
From: Yoshihiro OKUMURA <orrisroot@gmail.com>
Date: Tue, 30 Sep 2025 22:21:03 +0900
Subject: [PATCH] refactor: update type definitions for Kintone fields to
 improve type safety and clarity

---
 src/desktop/generateWordFileData.ts |  4 ++--
 src/types/kintone.d.ts              | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/desktop/generateWordFileData.ts b/src/desktop/generateWordFileData.ts
index d5788ef..6b70c0b 100644
--- a/src/desktop/generateWordFileData.ts
+++ b/src/desktop/generateWordFileData.ts
@@ -116,7 +116,7 @@ const formatCalculatedRecordValue = (
 
 const record2templateData = (
   properties: KintoneFormFieldProperties,
-  record: Partial<kintone.types.GenericFields>,
+  record: Partial<kintone.types.AllFields>,
   language: string,
 ): TemplateData => {
   const data: TemplateData = {};
@@ -175,7 +175,7 @@ const record2templateData = (
 const generateWordFileData = (
   content: ArrayBuffer,
   properties: KintoneFormFieldProperties,
-  record: kintone.types.GenericFields,
+  record: kintone.types.AllFields,
   language: string,
 ) => {
   const zip = new PizZip(content);
diff --git a/src/types/kintone.d.ts b/src/types/kintone.d.ts
index a1d001f..8c7f087 100644
--- a/src/types/kintone.d.ts
+++ b/src/types/kintone.d.ts
@@ -38,19 +38,27 @@ declare namespace kintone {
       | kintone.fieldTypes.RecordNumber
       | kintone.fieldTypes.UpdatedTime
       | kintone.fieldTypes.CreatedTime;
-    type SubtableValue<T extends string> = {
+    type SubtableValueItem<T extends string> = {
       id: string;
       value: Record<T, kintone.fieldTypes.InSubtableFieldTypes>;
     };
     type Subtable<T extends string> = {
       type: 'SUBTABLE';
-      value: Array<SubtableValue<T>>;
+      value: Array<kintone.fieldTypes.SubtableValueItem<T>>;
     };
-    type ExtraFieldTypes = Category | Status | StatusAssignee;
-    type GenericFieldTypes = InSubtableFieldTypes | SystemFieldTypes | Subtable<string> | ExtraFieldTypes;
+    type ExtraFieldTypes = kintone.fieldTypes.Category | kintone.fieldTypes.Status | kintone.fieldTypes.StatusAssignee;
+    type GenericFieldTypes = kintone.fieldTypes.InSubtableFieldTypes | kintone.fieldTypes.Subtable<string>;
+    type GenericSavedFieldTypes = kintone.fieldTypes.GenericFieldTypes | kintone.fieldTypes.SystemFieldTypes;
+    type AllFieldTypes = kintone.fieldTypes.GenericSavedFieldTypes | kintone.fieldTypes.ExtraFieldTypes;
   }
+
   namespace types {
     type GenericFields = Record<string, kintone.fieldTypes.GenericFieldTypes>;
+    type GenericSavedFields = Record<string, kintone.fieldTypes.GenericSavedFieldTypes>;
+    type AllFields = Record<string, kintone.fieldTypes.AllFieldTypes>;
+
+    type Fields = kintone.types.GenericFields;
+    type SavedFields = kintone.types.GenericSavedFields;
   }
 
   namespace events {