@tbox.cn/app-toolkit 0.6.0 → 0.7.0

package/tests/views.test.ts

@@ -24,7 +24,7 @@ interface Harness {
 }
 
 function harnessWithContracts(
-  opts: { version?: string; withStrict?: boolean; missingEvaluationExports?: boolean } = {},
+  opts: { version?: string; withStrict?: boolean; missingEvaluationExports?: boolean; resolveBody?: string[] } = {},
 ): Harness {
   const app = createTempApp('tbox-views-');
   invalidateContractsResolver();
@@ -33,6 +33,7 @@ function harnessWithContracts(
     version: opts.version ?? '0.9.0',
     withStrict: opts.withStrict ?? true,
     missingEvaluationExports: opts.missingEvaluationExports,
+    ...(opts.resolveBody ? { resolveBody: opts.resolveBody.join(' ') } : {}),
   });
   linkContracts(app.appDir, store, { subdir: 'apps/server' });
   // 应用结构：parking 模块（packages/ 约定发现）+ 注册表两实例 + integrations.json
@@ -378,6 +379,41 @@ describe('views/工厂（O 矩阵核心族）', () => {
     expect(single.resolution.inheritance).toHaveLength(4);
   });
 
+  it('O17 v6 ownerOf 视图轴透传（回归锁——fef9a71a 漏改点）：求值单源带 walk.ownership 第 5 参；modules 级 config 不触发 fail-visible', async () => {
+    // 假 contracts 复刻 v6 fail-visible 语义 + 回显 ownerOf：缺席 + modules 绑定面 → binding-unresolved；
+    // 在场 → effective.provider 前缀回显 owner 模块 id（证明透传值 = walk.ownership 内容本身）
+    const ownerEcho = harnessWithContracts({
+      resolveBody: [
+        'const modBinding = integrations && integrations.modules',
+        '  && Object.values(integrations.modules).some((m) => m.provider != null || m.config != null);',
+        'if ((ownerOf === undefined || ownerOf === null) && modBinding) return { status: "binding-unresolved", message: "OWNEROF_MISSING" };',
+        'const owner = ownerOf ? ownerOf[service] : undefined;',
+        'const slot = integrations && integrations.services && integrations.services[service];',
+        'const prov = (slot && slot.provider) || "root-mock";',
+        'return { status: "ok", effective: { provider: owner ? owner + ":" + prov : prov, implementation: "impl@1", config: {} } };',
+      ],
+    });
+    // 触发形态（bug 实景）：modules 仅 config（无 provider）+ 空 slot——依赖 ownerOf 注入才能过 fail-visible
+    writeAppFile(
+      ownerEcho.app.appDir,
+      'config/integrations.json',
+      JSON.stringify({
+        provider: 'root-mock',
+        modules: { 'module-parking': { config: { parkName: '示例车场' } } },
+        services: { 'parking.query': {}, 'auth.alipay-login': {} },
+      }),
+    );
+    const single = await ownerEcho.tk.loadServiceResolution('parking.query');
+    // ① fail-visible 未触发（ownerOf 已注入）
+    expect(single.resolution.status).toBe('ok');
+    // ② 透传值 = walk.ownership 内容（parking.query 归属 module-parking——harness manifest declare.owns）
+    expect(single.resolution.provider).toBe('module-parking:root-mock');
+    // ③ 无主服务回退无前缀（排除「任意 truthy 值即绿」的假阳性）
+    const orphan = await ownerEcho.tk.loadServiceResolution('auth.alipay-login');
+    expect(orphan.resolution.provider).toBe('root-mock');
+    ownerEcho.app.dispose();
+  });
+
   it('O3 键集 = 服务词汇 ∪ 已配置；required echo（OR 聚合 + 平台 false）', async () => {
     // vocabulary 空（无契约包 fixture 物化 slots——退化态回归锁；词汇在场态见 B1 族 T-O3）
     const batch = await h.tk.loadServiceResolutions();
@@ -393,28 +429,29 @@ describe('views/工厂（O 矩阵核心族）', () => {
     expect(batch.issues.length).toBeGreaterThanOrEqual(single.issues.length);
   });
 
-  it('O13 门控正反例：<0.9 求值 503 三分支 + 静态 200；多实例无显式默认 → 通配口径', async () => {
+  it('O13 门控正反例：<0.9 读求值轴降级骨架（v7 503 退役）+ 静态 200 + 写端点 503 保留；多实例无显式默认 → 通配口径', async () => {
     // 正例：≥0.9 求值可用（harness 默认）
     const batch = await h.tk.loadServiceResolutions();
     expect(batch.contracts.strictValidation).toBe(true);
     h.app.dispose();
 
-    // 反例：缺 zod 面（0.8.2）→ 求值 throw 503 + message 升级指引；静态照常
+    // 反例：缺 zod 面（0.8.2）→ 读求值轴降级骨架 + N1 升级指引入 statusMessage；静态照常
     const low = harnessWithContracts({ version: '0.8.2', withStrict: false });
-    await expect(low.tk.loadServiceResolutions()).rejects.toMatchObject({
-      code: 'CONTRACTS_NOT_RESOLVED',
-      httpStatus: 503,
-    });
-    await expect(low.tk.loadServiceResolutions()).rejects.toThrow(/升级应用 @tbox.cn\/app-contracts/);
+    const lowBatch = await low.tk.loadServiceResolutions();
+    expect(lowBatch.contracts.strictValidation).toBe(false);
+    const lowEntries = Object.values(lowBatch.resolutions);
+    expect(lowEntries.length).toBeGreaterThan(0);
+    expect(lowEntries.every((e) => e.status === 'evaluation-unavailable')).toBe(true);
+    expect(lowEntries[0]?.statusMessage).toMatch(/升级应用 @tbox\.cn\/app-contracts/);
+    expect(lowBatch.issues).toEqual([]);
     // 静态永不 503
     const appView = await low.tk.loadApp();
     expect(appView.services).toBeInstanceOf(Array);
-    // 写端点同样门控
+    // 写端点 503 门控保留（policy at edge 收窄至写/迁移面）
     await expect(
       low.tk.writeServiceIntegration('parking.query', { provider: 'mock' }),
     ).rejects.toMatchObject({ code: 'CONTRACTS_NOT_RESOLVED', httpStatus: 503 });
     low.app.dispose();
-
     // 默认实例委托：无 defaultInstanceId（多实例）→ '*' 通配口径（normalizeInstances null → '*'）
     const wild = harnessWithContracts();
     writeAppFile(
@@ -698,41 +735,102 @@ describe('O6/O7/O10/O14（FX-3 补全）', () => {
 });
 
 describe('A2 错误面（P-4 notes 优先 / P-5 畸形包 503）', () => {
-  it('M1 导入失败 message 含构建指引且不再误报未安装（P-4 notes 优先）', async () => {
+  it('M1 导入失败 message 含构建指引且不再误报未安装（P-4 notes 优先——v7 降级骨架 statusMessage 承载）', async () => {
     const app = createTempApp('tbox-m1-');
     invalidateContractsResolver();
     const store = joinStore(app.appDir, 'contracts');
     writeFakeContractsPackage(store, { version: '0.9.0', brokenDist: true });
     linkContracts(app.appDir, store, { subdir: 'apps/server' });
+    writeAppFile(app.appDir, 'config/integrations.json', JSON.stringify({ provider: 'mock', services: { 'parking.query': {} } }));
+    const tk = createAppToolkit(app.appDir);
+    const batch = await tk.loadServiceResolutions();
+    const entry = batch.resolutions['parking.query'];
+    expect(entry.status).toBe('evaluation-unavailable');
+    expect(entry.statusMessage).toMatch(/构建产物导入失败/);
+    expect(entry.statusMessage).not.toMatch(/未安装/);
+    app.dispose();
+  });
+
+  it('M4 无契约包（未安装）→ 降级骨架 + 声明实例枚举 + T2 空键集诚实态（问题②主形态）', async () => {
+    // T1 形态：contracts 未安装，walk 静态面在场（manifest demand/owns + integrations 配置）
+    const app = createTempApp('tbox-m4-');
+    invalidateContractsResolver();
+    writeAppFile(app.appDir, 'packages/module-parking/tbox.module.json', JSON.stringify({
+      schemaVersion: 1, id: 'module-parking', version: '0.1.0', kind: 'business',
+      declare: { owns: [{ service: 'parking.query' }], consumes: [{ service: 'parking.query', optional: false }] },
+      dependencies: { modules: [] },
+      env: [],
+    }));
+    writeAppFile(app.appDir, 'config/integrations.json', JSON.stringify({
+      provider: 'mock', instances: [{ id: 'mall-1' }], defaultInstanceId: 'mall-1',
+      services: { 'parking.query': { instances: { 'mall-1': { provider: 'wanda', implementation: 'wanda-parking@1' } } } },
+    }));
     const tk = createAppToolkit(app.appDir);
-    await expect(tk.loadServiceResolutions()).rejects.toThrow(/构建产物导入失败/);
-    await expect(tk.loadServiceResolutions()).rejects.not.toThrow(/未安装/);
+    const batch = await tk.loadServiceResolutions();
+    const entry = batch.resolutions['parking.query'];
+    expect(entry.status).toBe('evaluation-unavailable');
+    expect(entry.statusMessage).toMatch(/未安装/);
+    // 静态可算字段：module = demand owners 首（与求值轴同源）；required = OR 聚合
+    expect(entry.module).toBe('@app/module-parking');
+    expect(entry.required).toBe(true);
+    expect(batch.issues).toEqual([]);
+    // 单体：声明实例枚举（原始数据投影——root instances[].id）逐实例同标记；
+    // inheritance 四层静态投影（app=root.provider；instance=显式 defaultInstanceId 位声明——降级默认实例口径实证）
+    const detail = await tk.loadServiceResolution('parking.query');
+    expect(detail.resolution.instances.map((i) => i.instanceId)).toEqual(['mall-1']);
+    expect(detail.resolution.instances.every((i) => i.status === 'evaluation-unavailable')).toBe(true);
+    expect(detail.resolution.inheritance).toHaveLength(4);
+    expect(detail.resolution.inheritance.find((l) => l.layer === 'app')?.provider).toBe('mock');
+    const instLayer = detail.resolution.inheritance.find((l) => l.layer === 'instance');
+    expect(instLayer?.provider).toBe('wanda');
+    expect(instLayer?.implementation).toBe('wanda-parking@1');
+    // include 轴内嵌骨架（四面统一——P14 (b)）
+    const appInc = await tk.loadApp({ include: ['serviceResolutions'] });
+    expect(appInc.serviceResolutions?.resolutions['parking.query']?.status).toBe('evaluation-unavailable');
     app.dispose();
+
+    // T2 形态：无 manifest 无 integrations → 空键集诚实态（空列表非 503；envelope 携带原因）
+    const bare = createTempApp('tbox-m4b-');
+    invalidateContractsResolver();
+    const bareTk = createAppToolkit(bare.appDir);
+    const bareBatch = await bareTk.loadServiceResolutions();
+    expect(bareBatch.resolutions).toEqual({});
+    expect(bareBatch.contracts.version).toBeNull();
+    expect(bareBatch.contracts.notes.join()).toMatch(/未安装/);
+    bare.dispose();
   });
 
-  it('M2 <0.9 message 对齐 api.md 信封（需 ≥0.9.0——resolver note 文案）', async () => {
+  it('M2 <0.9 message 对齐 api.md 信封（需 ≥0.9.0——resolver note 文案入降级 statusMessage）', async () => {
     const app = createTempApp('tbox-m2-');
     invalidateContractsResolver();
     const store = joinStore(app.appDir, 'contracts');
     writeFakeContractsPackage(store, { version: '0.8.2', withStrict: false });
     linkContracts(app.appDir, store, { subdir: 'apps/server' });
+    writeAppFile(app.appDir, 'config/integrations.json', JSON.stringify({ provider: 'mock', services: { 'parking.query': {} } }));
     const tk = createAppToolkit(app.appDir);
-    await expect(tk.loadServiceResolutions()).rejects.toThrow(/需 ≥0\.9\.0/);
+    const entry = (await tk.loadServiceResolutions()).resolutions['parking.query'];
+    expect(entry.status).toBe('evaluation-unavailable');
+    expect(entry.statusMessage).toMatch(/需 ≥0\.9\.0/);
     app.dispose();
   });
 
-  it('M3 畸形包（求值面缺席）+ 无 config → 503 非 500（P-5——predicateIssues 早退绕过 assertFn 的唯一后续拦截点）', async () => {
+  it('M3 畸形包（严格面在场求值面缺席）→ 降级骨架非 5xx（v7——evaluationContracts throw 面不再可达；形态异常 note 入 statusMessage）', async () => {
     const app = createTempApp('tbox-m3-');
     invalidateContractsResolver();
     const store = joinStore(app.appDir, 'contracts');
     writeFakeContractsPackage(store, { version: '0.9.0', missingEvaluationExports: true, slots: ['parking.query'] });
     linkContracts(app.appDir, store, { subdir: 'apps/server' });
-    const tk = createAppToolkit(app.appDir); // 不写 integrations.json——config === null 早退路径
-    await expect(tk.loadServiceResolutions()).rejects.toMatchObject({
-      code: 'CONTRACTS_NOT_RESOLVED',
-      httpStatus: 503,
-    });
-    await expect(tk.loadServiceResolutions()).rejects.not.toThrow(/工厂门控应先行拦截/);
+    writeAppFile(app.appDir, 'config/integrations.json', JSON.stringify({ provider: 'mock', services: { 'parking.query': {} } }));
+    const tk = createAppToolkit(app.appDir);
+    const batch = await tk.loadServiceResolutions();
+    const entry = batch.resolutions['parking.query'];
+    expect(entry.status).toBe('evaluation-unavailable');
+    expect(entry.statusMessage).toMatch(/求值面具名导出缺席/);
+    expect(entry.statusMessage).toMatch(/契约包形态异常/);
+    // 声明实例投影在场（降级 detail——原始数据非 normalizeInstances 派生）
+    const detail = await tk.loadServiceResolution('parking.query');
+    expect(detail.resolution.status).toBe('evaluation-unavailable');
+    expect(detail.resolution.inheritance).toHaveLength(4);
     app.dispose();
   });
 });
@@ -849,7 +947,7 @@ describe('v6 所有权族（D34 多域钉死退役 → ownedServices/binding 单
     app.dispose();
   });
 
-  it('D6 偏斜态 503 第四分支（P1 标记门）：v5 contracts 假件（无 OWNERSHIP_BINDING_V6）+ v6 toolkit → 503', async () => {
+  it('D6 偏斜态分级（P1 标记门 v7）：v5 contracts 假件 + v6 toolkit → 写端点 503 保留；读求值轴降级骨架（503 退役）', async () => {
     const app = createTempApp('tbox-d6-');
     invalidateContractsResolver();
     const store = joinStore(app.appDir, 'contracts');
@@ -859,15 +957,21 @@ describe('v6 所有权族（D34 多域钉死退役 → ownedServices/binding 单
       schemaVersion: 1, id: 'module-parking', version: '0.1.0', kind: 'business',
       declare: { owns: [{ service: 'parking.query' }] },
     }));
+    writeAppFile(app.appDir, 'config/integrations.json', JSON.stringify({ provider: 'mock', services: { 'parking.query': {} } }));
     const tk = createAppToolkit(app.appDir);
-    // 写路径门控（求值轴同此门——assertContractsUsable 单点）
+    // 写路径门控保留（assertContractsUsable——policy at edge 收窄至写/迁移面）
     await expect(tk.writeModuleIntegration('module-parking', { provider: 'wanda' })).rejects.toMatchObject({
       code: 'CONTRACTS_NOT_RESOLVED',
       httpStatus: 503,
       message: expect.stringContaining('OWNERSHIP_BINDING_V6'),
     });
-    await expect(tk.loadServiceResolutions()).rejects.toMatchObject({ code: 'CONTRACTS_NOT_RESOLVED', httpStatus: 503 });
-    // 静态端点照常（永不 503——门控 policy at edge 只拦求值/写/migrate）
+    // 读求值轴降级（503 退役）：statusMessage 与写门控同源（N1 标记分支单源）
+    const degraded = await tk.loadServiceResolutions();
+    expect(degraded.contracts.strictValidation).toBe(true);
+    const entry = degraded.resolutions['parking.query'];
+    expect(entry.status).toBe('evaluation-unavailable');
+    expect(entry.statusMessage).toMatch(/OWNERSHIP_BINDING_V6 标记缺席/);
+    // 静态端点照常（永不 503——门控 policy at edge 只拦写/迁移）
     const mod = await tk.loadModule('module-parking');
     expect(mod.ownedServices).toEqual(['parking.query']);
     app.dispose();
@@ -921,15 +1025,20 @@ describe('v4.4 include 协议 + Entry.layer + 层级 schema（F4/F5）', () => {
     h2.app.dispose();
   });
 
-  it('I3 degrade：<0.9 → null 永不 503；形态异常包（严格面在场求值面缺席）→ null（双条件）', async () => {
+  it('I3 degrade：内嵌轴同步降级（v7 P14 (b)——D31 null 分支退役）：三条件不满足 → 骨架非 null', async () => {
     const low = harnessWithContracts({ version: '0.8.2', withStrict: false });
-    expect((await low.tk.loadApp({ include: ['serviceResolutions'] })).serviceResolutions).toBeNull();
+    const lowInc = await low.tk.loadApp({ include: ['serviceResolutions'] });
+    expect(lowInc.serviceResolutions).not.toBeNull();
+    const lowEntries = Object.values(lowInc.serviceResolutions!.resolutions);
+    expect(lowEntries.length).toBeGreaterThan(0);
+    expect(lowEntries.every((e) => e.status === 'evaluation-unavailable')).toBe(true);
     expect((await low.tk.loadApp({ include: ['integrationSchemas'] })).integrationSchemas).toEqual({ provider: 'mock', services: {} }); // 静态轴富化零 contracts
     low.app.dispose();
+    // 畸形包（严格面在场求值面缺席）→ 内嵌轴同样降级（503/双 null 全退役）
     const malformed = harnessWithContracts({ missingEvaluationExports: true });
-    expect((await malformed.tk.loadApp({ include: ['serviceResolutions'] })).serviceResolutions).toBeNull();
-    // 对照：求值轴端点同 fixture → 503（M3 已钉——门控与内嵌两机制不共用断言）
-    await expect(malformed.tk.loadServiceResolutions()).rejects.toMatchObject({ httpStatus: 503 });
+    const malformedInc = await malformed.tk.loadApp({ include: ['serviceResolutions'] });
+    expect(malformedInc.serviceResolutions).not.toBeNull();
+    expect(Object.values(malformedInc.serviceResolutions!.resolutions)[0]?.status).toBe('evaluation-unavailable');
     malformed.app.dispose();
   });