@forgeax/engine-fbx 0.1.3 → 0.1.6

package/dist/parse-material.d.ts

@@ -1,9 +1,4 @@
-import type { MaterialPod, MaterialTextureBindingPod } from '@forgeax/engine-types';
-export interface FbxRawTextureBinding {
-    readonly slot: MaterialTextureBindingPod['slot'];
-    readonly textureIndex: number;
-    readonly texCoord?: number;
-}
+import type { MaterialPod } from '@forgeax/engine-types';
 /** JSON shape emitted by binding.cc WriteMaterials for a single material. */
 export interface FbxRawMaterial {
     readonly name?: string;
@@ -12,7 +7,6 @@ export interface FbxRawMaterial {
     readonly diffuse?: readonly [number, number, number];
     readonly shininess?: number;
     readonly specular?: readonly [number, number, number];
-    readonly textureBindings?: readonly FbxRawTextureBinding[];
     readonly stingrayProps?: {
         readonly baseColor?: readonly [number, number, number];
         readonly metallic?: number;

package/dist/parse-material.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-material.d.ts","sourceRoot":"","sources":["../src/parse-material.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,WAAW,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAEpF,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAC;IACjD,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,6EAA6E;AAC7E,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,GAAG,SAAS,GAAG,UAAU,CAAC;IACjE,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACvD,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACrD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACtD,QAAQ,CAAC,eAAe,CAAC,EAAE,SAAS,oBAAoB,EAAE,CAAC;IAC3D,QAAQ,CAAC,aAAa,CAAC,EAAE;QACvB,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACvD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAC3B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;KACvD,CAAC;CACH;AAWD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,GAAG,WAAW,CA0FnF"}
+{"version":3,"file":"parse-material.d.ts","sourceRoot":"","sources":["../src/parse-material.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,6EAA6E;AAC7E,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,GAAG,SAAS,GAAG,UAAU,CAAC;IACjE,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACvD,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACrD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACtD,QAAQ,CAAC,aAAa,CAAC,EAAE;QACvB,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACvD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAC3B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;KACvD,CAAC;CACH;AAWD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,GAAG,WAAW,CAiDnF"}

package/dist/parse-texture.d.ts

@@ -1,11 +1,7 @@
 import type { TexturePod } from '@forgeax/engine-types';
 export interface FbxRawTexture {
     readonly name?: string;
-    readonly filePath?: string;
-    readonly relativeFilePath?: string;
-    readonly absoluteFilePath?: string;
-    readonly embeddedBytes?: readonly number[];
-    readonly type?: 'file' | 'layered' | 'procedural' | 'shader' | 'unknown';
+    readonly filePath: string;
     readonly sourceIndex: number;
 }
 export interface FbxRawTextures {

package/dist/parse-texture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-texture.d.ts","sourceRoot":"","sources":["../src/parse-texture.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,YAAY,GAAG,QAAQ,GAAG,SAAS,CAAC;IACzE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;CAC9C;AAMD,wBAAgB,aAAa,CAAC,GAAG,EAAE,cAAc,GAAG,UAAU,EAAE,CAa/D"}
+{"version":3,"file":"parse-texture.d.ts","sourceRoot":"","sources":["../src/parse-texture.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;CAC9C;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,cAAc,GAAG,UAAU,EAAE,CAO/D"}

package/dist/to-asset-pack.d.ts

@@ -1,4 +1,4 @@
-import type { AnimationClipPod, AssetCodec, ImportedAsset, MaterialPod, MeshMaterialSlotTopologyEntry, MeshPod, ScenePod, SkeletonPod, SkinPod, SourceOverrideMap, TextureAsset, TexturePod } from '@forgeax/engine-types';
+import type { AnimationClipPod, ImportedAsset, MaterialPod, MeshMaterialSlotTopologyEntry, MeshPod, ScenePod, SkeletonPod, SkinPod, SourceOverrideMap, TexturePod } from '@forgeax/engine-types';
 type SubAsset = {
     readonly guid: string;
     readonly sourceIndex: number;
@@ -16,12 +16,6 @@ export declare function buildMeshAsset(pod: MeshPod, guid: string, influences?:
     readonly materialSlotDefaultOverrides?: Readonly<Record<string, string | null>>;
     readonly meshSourceKey?: string;
 }): ImportedAsset;
-export interface FbxDecodedTexture {
-    readonly texture: TextureAsset;
-    readonly bytes: Uint8Array;
-    readonly mediaType?: string;
-    readonly assetCodec?: AssetCodec;
-}
 export declare function toAssetPack(params: {
     readonly meshes: readonly MeshPod[];
     readonly scene: ScenePod;
@@ -32,7 +26,6 @@ export declare function toAssetPack(params: {
     readonly animationClips: readonly AnimationClipPod[];
     readonly subAssets: readonly SubAsset[];
     readonly sourceOverrides?: SourceOverrideMap;
-    readonly decodedTextures?: ReadonlyMap<number, FbxDecodedTexture>;
 }): readonly ImportedAsset[];
 export {};
 //# sourceMappingURL=to-asset-pack.d.ts.map

package/dist/to-asset-pack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"to-asset-pack.d.ts","sourceRoot":"","sources":["../src/to-asset-pack.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EAEV,aAAa,EAEb,WAAW,EAKX,6BAA6B,EAC7B,OAAO,EAEP,QAAQ,EACR,WAAW,EACX,OAAO,EACP,iBAAiB,EACjB,YAAY,EACZ,UAAU,EACX,MAAM,uBAAuB,CAAC;AAS/B,KAAK,QAAQ,GAAG;IACd,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAWF,wBAAgB,cAAc,CAC5B,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,SAAS;IAAE,YAAY,EAAE,WAAW,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAE,EAAE,EACjF,eAAe,GAAE;IACf,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,QAAQ,CAAC,gBAAgB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxD,QAAQ,CAAC,qBAAqB,CAAC,EAAE,SAAS,6BAA6B,EAAE,CAAC;IAC1E,QAAQ,CAAC,4BAA4B,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;IAChF,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;CAC5B,GACL,aAAa,CAqRf;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;CAClC;AAwMD,wBAAgB,WAAW,CAAC,MAAM,EAAE;IAClC,QAAQ,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,SAAS,WAAW,EAAE,CAAC;IAC3C,QAAQ,CAAC,QAAQ,EAAE,SAAS,UAAU,EAAE,CAAC;IACzC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,cAAc,EAAE,SAAS,gBAAgB,EAAE,CAAC;IACrD,QAAQ,CAAC,SAAS,EAAE,SAAS,QAAQ,EAAE,CAAC;IACxC,QAAQ,CAAC,eAAe,CAAC,EAAE,iBAAiB,CAAC;IAC7C,QAAQ,CAAC,eAAe,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;CACnE,GAAG,SAAS,aAAa,EAAE,CAwP3B"}
+{"version":3,"file":"to-asset-pack.d.ts","sourceRoot":"","sources":["../src/to-asset-pack.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EACV,gBAAgB,EAEhB,aAAa,EAEb,WAAW,EAGX,6BAA6B,EAC7B,OAAO,EAEP,QAAQ,EACR,WAAW,EACX,OAAO,EACP,iBAAiB,EACjB,UAAU,EACX,MAAM,uBAAuB,CAAC;AAS/B,KAAK,QAAQ,GAAG;IACd,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAWF,wBAAgB,cAAc,CAC5B,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,SAAS;IAAE,YAAY,EAAE,WAAW,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAE,EAAE,EACjF,eAAe,GAAE;IACf,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,QAAQ,CAAC,gBAAgB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxD,QAAQ,CAAC,qBAAqB,CAAC,EAAE,SAAS,6BAA6B,EAAE,CAAC;IAC1E,QAAQ,CAAC,4BAA4B,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;IAChF,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;CAC5B,GACL,aAAa,CAqRf;AAyJD,wBAAgB,WAAW,CAAC,MAAM,EAAE;IAClC,QAAQ,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,SAAS,WAAW,EAAE,CAAC;IAC3C,QAAQ,CAAC,QAAQ,EAAE,SAAS,UAAU,EAAE,CAAC;IACzC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,cAAc,EAAE,SAAS,gBAAgB,EAAE,CAAC;IACrD,QAAQ,CAAC,SAAS,EAAE,SAAS,QAAQ,EAAE,CAAC;IACxC,QAAQ,CAAC,eAAe,CAAC,EAAE,iBAAiB,CAAC;CAC9C,GAAG,SAAS,aAAa,EAAE,CA4O3B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgeax/engine-fbx",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "private": false,
   "type": "module",
   "license": "MIT",
@@ -23,19 +23,18 @@
     "README.md"
   ],
   "dependencies": {
-    "@forgeax/engine-animation": "0.1.3",
-    "@forgeax/engine-math": "0.1.3",
-    "@forgeax/engine-render": "0.1.3",
-    "@forgeax/engine-scene": "0.1.3",
-    "@forgeax/engine-types": "0.1.3"
+    "@forgeax/engine-animation": "0.1.6",
+    "@forgeax/engine-math": "0.1.6",
+    "@forgeax/engine-pack": "0.1.6",
+    "@forgeax/engine-render": "0.1.6",
+    "@forgeax/engine-scene": "0.1.6",
+    "@forgeax/engine-types": "0.1.6"
   },
   "devDependencies": {
-    "@forgeax/engine-assets-runtime": "0.1.3",
-    "@forgeax/engine-ecs": "0.1.3",
-    "@forgeax/engine-geometry": "0.1.3",
-    "@forgeax/engine-import": "0.1.3",
-    "@forgeax/engine-picking": "0.1.3",
-    "@forgeax/engine-runtime": "0.1.3",
+    "@forgeax/engine-assets-runtime": "0.1.6",
+    "@forgeax/engine-import": "0.1.6",
+    "@forgeax/engine-picking": "0.1.6",
+    "@forgeax/engine-runtime": "0.1.6",
     "@types/node": "^20.14.0"
   },
   "forgeax": {

package/src/__tests__/blendshape-import.integration.test.ts

@@ -1,10 +1,9 @@
-import { World } from '@forgeax/engine-ecs';
-import { meshAssetKind } from '@forgeax/engine-geometry';
+import { AssetRegistry } from '@forgeax/engine-assets-runtime';
 import { ImporterRegistry, type RunImportMeta, runImport } from '@forgeax/engine-import';
+import type { MeshAsset } from '@forgeax/engine-types';
 import { describe, expect, it } from 'vitest';
 import { fbxImporter } from '../fbx-importer.js';
 import { initFbxWasm, parseFbx } from '../index.js';
-import { createAssetRuntimeFixture, installMeshDecoder } from './asset-runtime-fixture';
 
 const MESH_GUID = 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa';
 const sourceUrl = new URL(
@@ -53,7 +52,6 @@ describe('real FBX BlendShape import through ufbx WASM', () => {
     if (!result.ok || 'skipped' in result.value) throw new Error('expected FBX DDC pack');
     const entry = result.value.pack.assets.find((asset) => asset.guid === MESH_GUID);
     expect(entry?.kind).toBe('mesh');
-    if (entry === undefined) return;
     const payload = entry?.payload as {
       readonly vertices: readonly number[];
       readonly morphTargets?: readonly { readonly position?: readonly number[] }[];
@@ -64,20 +62,16 @@ describe('real FBX BlendShape import through ufbx WASM', () => {
     expect(payload.morphWeights).toEqual([0.25, 0.5]);
     expect(payload.vertices.length).toBe(3 * 12);
 
-    const assets = createAssetRuntimeFixture([entry]);
-    installMeshDecoder(assets);
-    try {
-      const loaded = await assets.load(MESH_GUID, meshAssetKind);
-      expect(loaded.ok).toBe(true);
-      if (!loaded.ok) return;
-      const world = new World();
-      world.internSharedRef('MeshAsset', loaded.value);
-      expect(loaded.value.kind).toBe('mesh');
-      expect(Array.from(loaded.value.morphWeights ?? [])).toEqual([0.25, 0.5]);
-      expect(loaded.value.morphTargets).toHaveLength(2);
-    } finally {
-      assets.dispose();
-    }
+    const runtime = new AssetRegistry({} as never);
+    const parsedMesh = runtime.parseAssetPayload('mesh', entry?.payload ?? {});
+    expect(parsedMesh).toMatchObject({ kind: 'mesh' });
+    expect(runtime.catalog(MESH_GUID, parsedMesh as never).ok).toBe(true);
+    const loaded = await runtime.loadByGuid<MeshAsset>(runtime.parseGuid(MESH_GUID));
+    expect(loaded.ok).toBe(true);
+    if (!loaded.ok) return;
+    expect(loaded.value.kind).toBe('mesh');
+    expect(Array.from(loaded.value.morphWeights ?? [])).toEqual([0.25, 0.5]);
+    expect(loaded.value.morphTargets).toHaveLength(2);
   });
 
   it('records that this real fixture has no imported animation clip', async () => {

package/src/__tests__/fbx-importer.test.ts

@@ -1,169 +1,5 @@
-import { ImporterRegistry, type RunImportMeta, runImport } from '@forgeax/engine-import';
-import type { ImportErrorDetail } from '@forgeax/engine-types';
 import { describe, expect, it } from 'vitest';
-import { deriveFbxSourceKeys, fbxImporter, sourceKeyForFbxOutput } from '../fbx-importer.js';
-
-const FBX_SOURCE = 'apps/hello/format-tier1/fixtures/multi-target-morph.fbx';
-const FBX_GUID = 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa';
-const FBX_SOURCE_URL = new URL(`../../../../${FBX_SOURCE}`, import.meta.url);
-
-async function readFbxFixture(): Promise<Uint8Array> {
-  const nodeFs = (await import('node:' + 'fs/promises')) as unknown as {
-    readonly readFile: (path: URL) => Promise<Uint8Array>;
-  };
-  return new Uint8Array(await nodeFs.readFile(FBX_SOURCE_URL));
-}
-
-function fbxMeta(): RunImportMeta {
-  return {
-    importer: 'fbx',
-    source: FBX_SOURCE,
-    subAssets: [
-      {
-        guid: FBX_GUID,
-        sourceIndex: 0,
-        sourceKey: 'fbx:mesh:MorphTriangle',
-        kind: 'mesh',
-      },
-    ],
-  };
-}
-
-describe('public FBX importer source-read recovery', () => {
-  it('preserves refusal and retries on the same registry and Meta/GUID', async () => {
-    const sourceBytes = await readFbxFixture();
-    const registry = new ImporterRegistry();
-    registry.register(fbxImporter);
-    const reads = { count: 0 };
-    let refuseImporterRead = true;
-    const fs = {
-      readSource: async () => {
-        reads.count += 1;
-        if (refuseImporterRead && reads.count === 2) {
-          return {
-            ok: false as const,
-            error: new Error('transient source read refusal: repairable'),
-          };
-        }
-        return { ok: true as const, value: sourceBytes };
-      },
-    };
-
-    const refused = await runImport(fbxMeta(), registry, fs);
-    expect(refused).toMatchObject({
-      ok: false,
-      error: {
-        code: 'source-read-failed',
-        detail: {
-          source: FBX_SOURCE,
-          reason: 'transient source read refusal: repairable',
-        },
-      },
-    });
-    expect(refused).not.toHaveProperty('value.pack');
-    expect(reads.count).toBe(2);
-
-    refuseImporterRead = false;
-    const repaired = await runImport(fbxMeta(), registry, fs);
-    const repeated = await runImport(fbxMeta(), registry, fs);
-    expect(repaired.ok).toBe(true);
-    expect(repeated.ok).toBe(true);
-    if (
-      !repaired.ok ||
-      'skipped' in repaired.value ||
-      !repeated.ok ||
-      'skipped' in repeated.value
-    ) {
-      throw new Error('repaired FBX import must publish a product');
-    }
-    expect(repaired.value.pack.assets).toHaveLength(1);
-    expect(repaired.value.pack.assets[0]).toMatchObject({
-      guid: FBX_GUID,
-      sourceKey: 'fbx:mesh:MorphTriangle',
-      kind: 'mesh',
-    });
-    expect(repeated.value.pack).toEqual(repaired.value.pack);
-    expect(reads.count).toBe(6);
-    expect(registry.registeredImporters()).toEqual(['fbx']);
-  });
-});
-
-describe('public FBX importer malformed-source recovery', () => {
-  it('returns one bounded source diagnostic, then retries deterministically on repaired bytes', async () => {
-    const sourceBytes = await readFbxFixture();
-    const meta = fbxMeta();
-    const registry = new ImporterRegistry();
-    registry.register(fbxImporter);
-    const reads = { count: 0 };
-    let bytes: Uint8Array<ArrayBufferLike> = new TextEncoder().encode(
-      'readable but malformed FBX source',
-    );
-    const fs = {
-      readSource: async (path: string) => {
-        reads.count += 1;
-        expect(path).toBe(FBX_SOURCE);
-        return { ok: true as const, value: bytes };
-      },
-    };
-
-    const refused = await runImport(meta, registry, fs);
-    expect(refused.ok).toBe(false);
-    expect(refused).not.toHaveProperty('value');
-    if (refused.ok) throw new Error('malformed FBX must be refused');
-    const diagnostics = (
-      refused.error.detail as Extract<
-        ImportErrorDetail,
-        { readonly diagnostics: readonly unknown[] }
-      >
-    ).diagnostics;
-    expect(refused.error.code).toBe('source-validation-failed');
-    expect(refused.error).not.toHaveProperty('value');
-    expect(refused.error).not.toHaveProperty('pack');
-    expect(refused.error).not.toHaveProperty('cookProducts');
-    expect(diagnostics).toHaveLength(1);
-    expect(refused.error).toMatchObject({
-      expected: 'a readable FBX source that ufbx can parse',
-      detail: {
-        diagnostics: [
-          {
-            code: 'fbx-source-parse-failed',
-            severity: 'error',
-            sourcePath: FBX_SOURCE,
-            sourceRange: { start: 0, end: 0, line: 1, column: 1 },
-            rule: 'fbx-source-parse',
-            expected: 'a readable FBX source that ufbx can parse',
-            actual: 'fbx-wasm: Unrecognized file format',
-          },
-        ],
-      },
-    });
-    expect(diagnostics[0]?.actual.length).toBeLessThanOrEqual(256);
-    expect(reads.count).toBe(2);
-
-    bytes = sourceBytes;
-    const repaired = await runImport(meta, registry, fs);
-    const repeated = await runImport(meta, registry, fs);
-    expect(repaired.ok).toBe(true);
-    expect(repeated.ok).toBe(true);
-    if (
-      !repaired.ok ||
-      'skipped' in repaired.value ||
-      !repeated.ok ||
-      'skipped' in repeated.value
-    ) {
-      throw new Error('repaired FBX import must publish a product');
-    }
-    expect(repaired.value.pack).toEqual(repeated.value.pack);
-    expect(repaired.value.pack.assets).toHaveLength(1);
-    expect(repaired.value.pack.assets[0]).toMatchObject({
-      guid: FBX_GUID,
-      sourceKey: 'fbx:mesh:MorphTriangle',
-      kind: 'mesh',
-    });
-    expect(reads.count).toBe(6);
-    expect(registry.registeredImporters()).toEqual(['fbx']);
-  });
-});
+import { deriveFbxSourceKeys, sourceKeyForFbxOutput } from '../fbx-importer.js';
 
 describe('fbx importer contract migration fixture', () => {
   it('requires the generic ImportProduct shape', () => {

package/src/__tests__/index.test.ts

@@ -52,6 +52,7 @@ describe('@forgeax/engine-fbx barrel', () => {
     expect(typeof mod.parseSkin).toBe('function');
     expect(typeof mod.parseAnimationClips).toBe('function');
     expect(typeof mod.parseTextures).toBe('function');
+    expect(typeof mod.resolveFbxTexturePath).toBe('function');
     expect(typeof mod.toAssetPack).toBe('function');
     expect(typeof mod.fbxErr).toBe('function');
   });

package/src/fbx-importer.ts

@@ -1,13 +1,6 @@
 // fbx-importer.ts — TS wrapper around the ufbx WASM parser.
 
-import {
-  IMPORT_ERROR_HINTS,
-  type ImportContext,
-  type ImportDiagnostic,
-  ImportError,
-  type Importer,
-  type ImportResult,
-} from '@forgeax/engine-types';
+import type { ImportContext, Importer, ImportResult } from '@forgeax/engine-types';
 import { fbxErr } from './errors.js';
 import { initFbxWasm, parseFbx } from './index.js';
 import {
@@ -21,13 +14,11 @@ import { type FbxRawNodes, parseScene } from './parse-scene.js';
 import { type FbxRawSkeletonDoc, parseSkeleton } from './parse-skeleton.js';
 import { type FbxRawSkinDoc, parseSkin } from './parse-skin.js';
 import { parseTextures } from './parse-texture.js';
-import { resolveFbxTexturePath } from './resolve-texture-path.js';
-import { type FbxDecodedTexture, toAssetPack } from './to-asset-pack.js';
+import { toAssetPack } from './to-asset-pack.js';
 
 export interface FbxSourceKeyOutput {
   readonly kind: string;
   readonly name?: string;
-  readonly sourceKey?: string;
 }
 
 export type FbxSourceKeyResult =
@@ -41,8 +32,6 @@ export type FbxSourceKeyResult =
 export function sourceKeyForFbxOutput(output: FbxSourceKeyOutput): string | undefined {
   const kind = output.kind.trim();
   if (kind.length === 0) return undefined;
-  const explicit = output.sourceKey?.trim();
-  if (explicit !== undefined && explicit.length > 0) return explicit;
   const name = output.name?.trim();
   return name === undefined || name.length === 0 ? `fbx:${kind}` : `fbx:${kind}:${name}`;
 }
@@ -64,97 +53,6 @@ export function deriveFbxSourceKeys(outputs: readonly FbxSourceKeyOutput[]): Fbx
   return { ok: true, keys: keys as string[] };
 }
 
-function validationError(
-  ctx: ImportContext,
-  textureIndex: number,
-  code: string,
-  actual: string,
-  hint: string,
-): ImportError {
-  const diagnostic: ImportDiagnostic = {
-    code,
-    severity: 'error',
-    sourcePath: `${ctx.source}#textures[${textureIndex}]`,
-    sourceRange: { start: 0, end: 0, line: 1, column: 1 },
-    rule: 'fbx-external-texture-dependency-closure',
-    expected:
-      'every bound FBX texture resolves to one readable supported image in the authorized scope',
-    actual,
-    hint,
-  };
-  return new ImportError({
-    code: 'source-validation-failed',
-    expected: diagnostic.expected,
-    hint: IMPORT_ERROR_HINTS['source-validation-failed'],
-    detail: { diagnostics: [diagnostic] },
-  });
-}
-
-const FBX_PARSE_DIAGNOSTIC_MAX = 256;
-const FBX_PARSE_EXPECTED = 'a readable FBX source that ufbx can parse';
-
-function boundedErrorMessage(error: unknown): string {
-  const message = error instanceof Error ? error.message : String(error);
-  return message.length <= FBX_PARSE_DIAGNOSTIC_MAX
-    ? message
-    : `${message.slice(0, FBX_PARSE_DIAGNOSTIC_MAX - 3)}...`;
-}
-
-function parseValidationError(ctx: ImportContext, error: unknown): ImportError {
-  const actual = boundedErrorMessage(error);
-  const diagnostic: ImportDiagnostic = {
-    code: 'fbx-source-parse-failed',
-    severity: 'error',
-    sourcePath: ctx.source,
-    sourceRange: { start: 0, end: 0, line: 1, column: 1 },
-    rule: 'fbx-source-parse',
-    expected: FBX_PARSE_EXPECTED,
-    actual,
-    hint: 'repair or re-export the FBX source, then retry the same importer and source path',
-  };
-  return new ImportError({
-    code: 'source-validation-failed',
-    expected: FBX_PARSE_EXPECTED,
-    actual,
-    hint: IMPORT_ERROR_HINTS['source-validation-failed'],
-    detail: { diagnostics: [diagnostic] },
-  });
-}
-
-function importCandidates(ctx: ImportContext): readonly { readonly relativePath: string }[] {
-  const raw = ctx.importSettings.fbxCandidatePaths;
-  if (!Array.isArray(raw)) return [];
-  return raw.flatMap((path): { readonly relativePath: string }[] =>
-    typeof path === 'string' ? [{ relativePath: path }] : [],
-  );
-}
-
-function mimeForTexture(
-  path: string,
-  bytes: Uint8Array,
-): 'image/png' | 'image/jpeg' | 'image/x-tga' {
-  const lower = path.toLowerCase();
-  if (lower.endsWith('.png') || (bytes[0] === 0x89 && bytes[1] === 0x50 && bytes[2] === 0x4e)) {
-    return 'image/png';
-  }
-  if (
-    lower.endsWith('.jpg') ||
-    lower.endsWith('.jpeg') ||
-    (bytes[0] === 0xff && bytes[1] === 0xd8)
-  ) {
-    return 'image/jpeg';
-  }
-  return 'image/x-tga';
-}
-
-function textureColorSpace(slot: string): 'srgb' | 'linear' {
-  return slot === 'normalTexture' ||
-    slot === 'metallicRoughnessTexture' ||
-    slot === 'occlusionTexture'
-    ? 'linear'
-    : 'srgb';
-}
-
 export const fbxImporter: Importer = {
   key: 'fbx',
 
@@ -164,31 +62,17 @@ export const fbxImporter: Importer = {
     // addon / SDK build step (the WASM module self-loads its .wasm).
     const read = await ctx.readSource();
     if (!read.ok) {
-      return {
-        ok: false,
-        error: new ImportError({
-          code: 'source-read-failed',
-          expected: `readable source file at meta.source "${ctx.source}"`,
-          hint: IMPORT_ERROR_HINTS['source-read-failed'],
-          detail: {
-            source: ctx.source,
-            reason: read.error instanceof Error ? read.error.message : String(read.error),
-          },
-        }),
-      };
+      const wrapper = new Error(`fbx-source-unreadable: ${ctx.source}`);
+      (wrapper as { cause?: unknown }).cause = read.error;
+      throw wrapper;
     }
 
     await initFbxWasm();
-    let doc: FbxRawDocument & FbxRawSkeletonDoc & FbxRawSkinDoc & FbxRawAnimDoc;
-    try {
-      const jsonStr = parseFbx(read.value);
-      doc = JSON.parse(jsonStr) as FbxRawDocument &
-        FbxRawSkeletonDoc &
-        FbxRawSkinDoc &
-        FbxRawAnimDoc;
-    } catch (error) {
-      return { ok: false, error: parseValidationError(ctx, error) };
-    }
+    const jsonStr = parseFbx(read.value);
+    const doc = JSON.parse(jsonStr) as FbxRawDocument &
+      FbxRawSkeletonDoc &
+      FbxRawSkinDoc &
+      FbxRawAnimDoc;
 
     // NURBS / patch fail-fast: the bridge emits an error envelope for
     // unsupported surface types (charter P3 explicit failure).
@@ -241,115 +125,6 @@ export const fbxImporter: Importer = {
     }
     const animationClips = parseAnimationClips(doc);
 
-    const textureSlots = new Map<number, string>();
-    for (const material of materials) {
-      for (const binding of material.textureBindings ?? []) {
-        const prior = textureSlots.get(binding.textureIndex);
-        const colorSpace = textureColorSpace(binding.slot);
-        if (prior !== undefined && prior !== colorSpace) {
-          return {
-            ok: false,
-            error: validationError(
-              ctx,
-              binding.textureIndex,
-              'fbx-texture-color-space-conflict',
-              `texture ${binding.textureIndex} is used as both ${prior} and ${colorSpace}`,
-              'split the source texture or author one color-space semantic per FBX texture',
-            ),
-          };
-        }
-        textureSlots.set(binding.textureIndex, colorSpace);
-      }
-    }
-
-    const decodedTextures = new Map<number, FbxDecodedTexture>();
-    for (const texture of textures) {
-      const guidDeclared = ctx.subAssets.some(
-        (subAsset) => subAsset.kind === 'texture' && subAsset.sourceIndex === texture.sourceIndex,
-      );
-      if (!guidDeclared) continue;
-
-      let bytes: Uint8Array;
-      let sourcePath = texture.filePath;
-      if (texture.embeddedBytes !== undefined && texture.embeddedBytes.byteLength > 0) {
-        bytes = texture.embeddedBytes;
-        sourcePath = texture.relativeFilePath ?? texture.filePath;
-      } else {
-        if (texture.type !== undefined && texture.type !== 'file') {
-          return {
-            ok: false,
-            error: validationError(
-              ctx,
-              texture.sourceIndex,
-              'fbx-material-texture-slot-unsupported',
-              `texture type ${texture.type} is not a single file texture`,
-              'flatten layered/procedural FBX textures to a file texture before importing',
-            ),
-          };
-        }
-        const resolution = resolveFbxTexturePath(
-          ctx.source,
-          {
-            ...(texture.relativeFilePath === undefined
-              ? {}
-              : { declaredRelativePath: texture.relativeFilePath }),
-            ...(texture.filePath.length === 0 ? {} : { declaredFilename: texture.filePath }),
-            ...(texture.absoluteFilePath === undefined
-              ? {}
-              : { declaredAbsolutePath: texture.absoluteFilePath }),
-          },
-          importCandidates(ctx),
-        );
-        if (!resolution.ok) {
-          return {
-            ok: false,
-            error: validationError(
-              ctx,
-              texture.sourceIndex,
-              resolution.code,
-              `${resolution.requestedPath}; candidates=${resolution.candidates.join(', ') || '<none>'}`,
-              resolution.code === 'fbx-external-texture-ambiguous'
-                ? 'select a folder whose dependency path is unique; first-match guessing is disabled'
-                : 'select the containing folder so the FBX and its referenced texture are in the authorized candidate scope',
-            ),
-          };
-        }
-        const read = await ctx.readSibling(resolution.readUri);
-        if (!read.ok) return read;
-        bytes = read.value;
-        sourcePath = resolution.relativePath;
-      }
-
-      const slot =
-        [...textureSlots.entries()].find(([index]) => index === texture.sourceIndex)?.[1] ?? 'srgb';
-      const decoded = await ctx.decodeImage(bytes, mimeForTexture(sourcePath, bytes), {
-        ...ctx.importSettings,
-        colorSpace: slot,
-      });
-      if (!decoded.ok) {
-        const reason =
-          decoded.error.code === 'image-decode-failed'
-            ? decoded.error.detail.reason
-            : `${decoded.error.code}: ${JSON.stringify(decoded.error.detail)}`;
-        return {
-          ok: false,
-          error: validationError(
-            ctx,
-            texture.sourceIndex,
-            'fbx-external-texture-decode-failed',
-            `${sourcePath}: ${reason}`,
-            'repair or re-export the referenced image, then retry the FBX import',
-          ),
-        };
-      }
-      decodedTextures.set(texture.sourceIndex, {
-        texture: decoded.value.texture,
-        bytes: decoded.value.bytes,
-        ...(decoded.value.mediaType === undefined ? {} : { mediaType: decoded.value.mediaType }),
-        ...(decoded.value.assetCodec === undefined ? {} : { assetCodec: decoded.value.assetCodec }),
-      });
-    }
-
     return {
       ok: true,
       value: {
@@ -362,7 +137,6 @@ export const fbxImporter: Importer = {
           skin,
           animationClips,
           subAssets: ctx.subAssets,
-          decodedTextures,
           ...(ctx.sourceOverrides === undefined ? {} : { sourceOverrides: ctx.sourceOverrides }),
         }),
         sourceDependencies: [],