Merge pull request #68 from TriVR-TRPG/codex/update-tag-assignment-in-createimportgroup

Defer import-root tagging and enforce undefined-usage policy for slot updates

Author: blhsrwznrghfzpr

.github/workflows/release-build.yml

@@ -62,11 +62,7 @@ jobs:
 
           $patterns = @(
             "dist/*.zip",
-            "dist/*.exe",
-            "dist/*-macos",
-            "dist/*-linux",
             "release/*.zip",
-            "release/*.exe",
             "release/*.dmg",
             "release/*.AppImage",
             "release/latest*.yml"
@@ -106,9 +102,6 @@ jobs:
           make_latest: false
           files: |
             release-artifacts/*.zip
-            release-artifacts/*.exe
-            release-artifacts/*-macos
-            release-artifacts/*-linux
             release-artifacts/*.AppImage
             release-artifacts/latest*.yml
           fail_on_unmatched_files: false

src/gui/main.ts

@@ -217,7 +217,7 @@ async function handleImportToResonite(options: ImportOptions): Promise<ImportRes
     // rootScale from the UI is only used as the default for fresh imports.
     const groupName = `Udonarium Import - ${path.basename(filePath, '.zip')}`;
     const defaultScale = { x: rootScale, y: rootScale, z: rootScale };
-    await slotBuilder.createImportGroup(
+    const groupId = await slotBuilder.createImportGroup(
       groupName,
       previousImport.transform,
       defaultScale,
@@ -284,6 +284,8 @@ async function handleImportToResonite(options: ImportOptions): Promise<ImportRes
       { enableSimpleAvatarProtection }
     );
 
+    await slotBuilder.tagImportGroupRoot(groupId);
+
     client.disconnect();
     sendProgress('import', 100, '完了');
 

src/i18n/locales/en.json

@@ -42,33 +42,42 @@
   },
   "gui": {
     "subtitle": "Import Udonarium save data into Resonite",
-    "selectFile": "Select ZIP File",
     "selectFilePlaceholder": "Select a file...",
     "browse": "Browse...",
-    "analysisResult": "Analysis Result",
-    "xmlFiles": "XML Files",
-    "imageFiles": "Image Files",
-    "objects": "Objects",
-    "settings": "ResoniteLink Settings",
-    "host": "Host:",
-    "port": "Port:",
+    "host": "ResoniteLink Host",
+    "resoniteLinkPort": "ResoniteLink Port",
+    "portHelpAriaLabel": "ResoniteLink port help",
+    "portHelpTooltip": "Click to view how to configure ResoniteLink",
+    "portHelpTitle": "How to configure ResoniteLink",
+    "portHelpStep1": "Open a world where you are the host",
+    "portHelpStep2": "In the Session tab, enable \"ResoniteLink\"",
+    "portHelpStep3": "Enter the ResoniteLink port number",
+    "dropZipOnly": "Please drop a ZIP file",
+    "rootGrabbable": "Add Grabbable to root",
+    "simpleAvatarProtection": "Add SimpleAvatarProtection",
+    "rootScale": "Root Scale",
+    "lockedTerrainCharacterCollider": "Enable collider on table and locked terrain",
+    "semiTransparentImageBlendMode": "Blend mode for semi-transparent images",
+    "blendModeCutout": "Cutout",
+    "blendModeAlpha": "Alpha",
     "settingsHint": "Start Resonite and enable ResoniteLink.",
-    "import": "Import",
+    "mainControlsTitle": "Import Settings",
+    "advancedOptions": "Advanced Options",
+    "advancedOptionsTitle": "Advanced Options",
+    "importLogTitle": "Import Log",
     "importToResonite": "Import to Resonite",
     "preparing": "Preparing...",
     "importComplete": "Import Complete!",
     "images": "Images: {imported}/{total}",
     "objectsResult": "Objects: {imported}/{total}",
     "checkResonite": "Check Resonite to see the imported objects.",
-    "error": "Error",
     "errorOccurred": "An error occurred",
     "ensureResonite": "Make sure Resonite is running.",
+    "ensureSupportedObjects": "Use a ZIP file that contains supported Udonarium objects.",
     "extracting": "Extracting ZIP file...",
     "parsingObjects": "Parsing objects...",
     "connectingResonite": "Connecting to ResoniteLink...",
     "importingData": "Importing...",
-    "importingImages": "Importing images... {current}/{total}",
-    "creatingObjects": "Creating objects... {current}/{total}",
     "complete": "Complete"
   },
   "objectTypes": {

src/i18n/locales/ja.json

@@ -42,33 +42,42 @@
   },
   "gui": {
     "subtitle": "UdonariumのセーブデータをResoniteにインポート",
-    "selectFile": "ZIPファイルを選択",
     "selectFilePlaceholder": "ファイルを選択してください...",
     "browse": "選択",
-    "analysisResult": "解析結果",
-    "xmlFiles": "XMLファイル",
-    "imageFiles": "画像ファイル",
-    "objects": "オブジェクト",
-    "settings": "ResoniteLink設定",
-    "host": "ホスト:",
-    "port": "ポート:",
+    "host": "ResoniteLinkホスト",
+    "resoniteLinkPort": "ResoniteLinkポート",
+    "portHelpAriaLabel": "ResoniteLinkポートのヘルプ",
+    "portHelpTooltip": "ResoniteLinkの設定方法を表示",
+    "portHelpTitle": "ResoniteLinkの設定方法",
+    "portHelpStep1": "自分がホストのワールドを開く",
+    "portHelpStep2": "セッションタブで「ResoniteLinkを有効化」",
+    "portHelpStep3": "ResoniteLinkのポート番号を入力",
+    "dropZipOnly": "ZIPファイルをドロップしてください",
+    "rootGrabbable": "ルートにGrabbableを付ける",
+    "simpleAvatarProtection": "SimpleAvatarProtectionを付ける",
+    "rootScale": "ルートスケール",
+    "lockedTerrainCharacterCollider": "テーブルと固定した地形にコライダーを付ける",
+    "semiTransparentImageBlendMode": "半透明画像の描画方式",
+    "blendModeCutout": "Cutout",
+    "blendModeAlpha": "Alpha",
     "settingsHint": "Resoniteを起動し、ResoniteLinkを有効にしてください。",
-    "import": "インポート",
+    "mainControlsTitle": "インポート設定",
+    "advancedOptions": "高度なオプション",
+    "advancedOptionsTitle": "高度なオプション",
+    "importLogTitle": "インポート実行ログ",
     "importToResonite": "Resoniteにインポート",
     "preparing": "準備中...",
     "importComplete": "インポート完了！",
     "images": "画像: {imported}/{total}",
     "objectsResult": "オブジェクト: {imported}/{total}",
     "checkResonite": "Resoniteで確認してください",
-    "error": "エラー",
     "errorOccurred": "エラーが発生しました",
     "ensureResonite": "Resoniteが起動しているか確認してください。",
+    "ensureSupportedObjects": "対応オブジェクトを含むUdonariumのZIPファイルを指定してください。",
     "extracting": "ZIPファイルを解凍中...",
     "parsingObjects": "オブジェクトを解析中...",
     "connectingResonite": "ResoniteLinkに接続中...",
     "importingData": "インポート中...",
-    "importingImages": "画像をインポート中... {current}/{total}",
-    "creatingObjects": "オブジェクトを作成中... {current}/{total}",
     "complete": "完了"
   },
   "objectTypes": {

src/index.ts

@@ -426,6 +426,8 @@ async function run(options: CLIOptions): Promise<void> {
       }
     }
 
+    await slotBuilder.tagImportGroupRoot(groupId);
+
     const successImages = importedImages - failedImages.length;
     const successObjects = builtSlots - failedSlots.length;
     importSpinner.succeed(

src/parser/objects/TerrainParser.test.ts

@@ -57,7 +57,7 @@ describe('TerrainParser', () => {
       expect(result.name).toBe('fallback-terrain.xml');
     });
 
-    it('should default dimensions to 1', () => {
+    it('should default dimensions to 0', () => {
       const data = {
         data: [
           {
@@ -74,9 +74,9 @@ describe('TerrainParser', () => {
 
       const result = parseTerrain(data, 'test.xml');
 
-      expect(result.width).toBe(1);
-      expect(result.height).toBe(1);
-      expect(result.depth).toBe(1);
+      expect(result.width).toBe(0);
+      expect(result.height).toBe(0);
+      expect(result.depth).toBe(0);
     });
 
     it('should preserve depth=0 when explicitly provided', () => {
@@ -348,9 +348,9 @@ describe('TerrainParser', () => {
 
       expect(result.id).toBe('empty.xml');
       expect(result.name).toBe('empty.xml');
-      expect(result.width).toBe(1);
-      expect(result.height).toBe(1);
-      expect(result.depth).toBe(1);
+      expect(result.width).toBe(0);
+      expect(result.height).toBe(0);
+      expect(result.depth).toBe(0);
       expect(result.isLocked).toBe(false);
       expect(result.mode).toBe(0);
       expect(result.rotate).toBe(0);

src/parser/objects/TerrainParser.ts

@@ -34,9 +34,9 @@ export function parseTerrain(data: unknown, fileName: string): Terrain {
   // Parse common data
   const commonData = findDataByName(terrainData, 'common');
   const name = getTextValue(findDataByName(commonData, 'name')) || fileName;
-  const width = getNumberValue(findDataByName(commonData, 'width')) ?? 1;
-  const height = getNumberValue(findDataByName(commonData, 'height')) ?? 1;
-  const depth = getNumberValue(findDataByName(commonData, 'depth')) ?? 1;
+  const width = getNumberValue(findDataByName(commonData, 'width')) ?? 0;
+  const height = getNumberValue(findDataByName(commonData, 'height')) ?? 0;
+  const depth = getNumberValue(findDataByName(commonData, 'depth')) ?? 0;
 
   // Parse position
   const position = parsePosition(root);

src/resonite/ResoniteLinkClient.test.ts

@@ -73,7 +73,6 @@ describe('ResoniteLinkClient', () => {
       parentId: 'Root',
       name: 'Test',
       position: { x: 0, y: 0, z: 0 },
-      tag: 'tagged',
     });
 
     expect(id).toBe('slot-id');
@@ -83,7 +82,7 @@ describe('ResoniteLinkClient', () => {
     const data = payload.data as Record<string, unknown>;
     expect(data.id).toBe('slot-id');
     expect(data.parent).toEqual(expect.objectContaining({ targetId: 'Root' }));
-    expect(data.tag).toEqual(expect.objectContaining({ value: 'tagged' }));
+    expect(data).not.toHaveProperty('tag');
   });
 
   it('throws when not connected', async () => {
@@ -141,6 +140,24 @@ describe('ResoniteLinkClient', () => {
     expect(payload.rotation?.value.w).toBeCloseTo(0, 5);
   });
 
+  it('updateSlot updates tag field when provided', async () => {
+    await client.connect();
+    mockLink.slotUpdate.mockResolvedValue({ success: true });
+
+    await client.updateSlot({
+      id: 'slot-tag',
+      tag: 'import-root',
+    });
+
+    expect(mockLink.slotUpdate).toHaveBeenCalledTimes(1);
+    const [slotId, payload] = mockLink.slotUpdate.mock.calls[0] as [
+      string,
+      { tag?: { value: string } },
+    ];
+    expect(slotId).toBe('slot-tag');
+    expect(payload.tag).toEqual(expect.objectContaining({ value: 'import-root' }));
+  });
+
   it('passes ws.WebSocket constructor to tsrl connect', async () => {
     await client.connect();
     expect(connectMock).toHaveBeenCalledTimes(1);

src/resonite/ResoniteLinkClient.ts

@@ -63,7 +63,6 @@ interface RawAddSlotMessage {
     rotation: RawFieldValue<Quaternion>;
     isActive: RawFieldValue<boolean>;
     isPersistent: RawFieldValue<boolean>;
-    tag: RawFieldValue<string>;
     orderOffset: RawFieldValue<number>;
   };
 }
@@ -130,7 +129,6 @@ function toTsrlClientMessage(message: RawClientMessage): ClientMessage {
           rotation: message.data.rotation,
           isActive: message.data.isActive,
           isPersistent: message.data.isPersistent,
-          tag: message.data.tag,
           orderOffset: message.data.orderOffset,
         },
       };
@@ -273,7 +271,6 @@ export class ResoniteLinkClient {
     rotation?: Quaternion;
     scale?: Vector3;
     isActive?: boolean;
-    tag?: string;
   }): Promise<string> {
     const scale = options.scale ?? { x: 1, y: 1, z: 1 };
     const rotation = options.rotation ?? { x: 0, y: 0, z: 0, w: 1 };
@@ -288,7 +285,6 @@ export class ResoniteLinkClient {
         rotation: createField(rotation),
         isActive: createField(options.isActive ?? true),
         isPersistent: createField(true),
-        tag: createField(options.tag ?? ''),
         orderOffset: createField(0),
       },
     };
@@ -305,6 +301,7 @@ export class ResoniteLinkClient {
     position?: Vector3;
     rotation?: Vector3;
     scale?: Vector3;
+    tag?: string;
   }): Promise<void> {
     const link = this.getConnectedLink();
 
@@ -318,6 +315,9 @@ export class ResoniteLinkClient {
     if (options.scale) {
       data.scale = createField(options.scale);
     }
+    if (typeof options.tag === 'string') {
+      data.tag = createField(options.tag);
+    }
 
     if (Object.keys(data).length === 0) {
       return;

src/resonite/SlotBuilder.test.ts

@@ -985,6 +985,17 @@ describe('SlotBuilder', () => {
     });
   });
 
+  describe('tagImportGroupRoot', () => {
+    it('should apply import root tag to specified slot', async () => {
+      await slotBuilder.tagImportGroupRoot('group-slot-id');
+
+      expect(mockClient.updateSlot).toHaveBeenCalledWith({
+        id: 'group-slot-id',
+        tag: IMPORT_ROOT_TAG,
+      });
+    });
+  });
+
   describe('createImportGroup', () => {
     it('should create a group slot with UUID-based ID', async () => {
       await slotBuilder.createImportGroup('My Import');
@@ -996,7 +1007,6 @@ describe('SlotBuilder', () => {
           position: { x: 0, y: IMPORT_GROUP_Y_OFFSET, z: 0 },
           rotation: { x: 0, y: 1, z: 0, w: 0 },
           scale: { x: IMPORT_GROUP_SCALE, y: IMPORT_GROUP_SCALE, z: IMPORT_GROUP_SCALE },
-          tag: IMPORT_ROOT_TAG,
         })
       );
 
@@ -1014,6 +1024,7 @@ describe('SlotBuilder', () => {
         componentType: COMPONENT_TYPES.SIMPLE_AVATAR_PROTECTION,
         fields: {},
       });
+      expect(mockClient.updateSlot).not.toHaveBeenCalled();
     });
 
     it('should return the group slot ID', async () => {