@tbox.cn/app-toolkit 0.4.0 → 0.6.0

package/tests/write-core.test.ts

@@ -277,6 +277,89 @@ describe('写核心管线（FX-1c）', () => {
     expect(existsSync(h.credFile('p-x-mall-1-global'))).toBe(true);
   });
 
+  // ── v6 守卫真值族（P5）：modules 集成位键集纪律 + resources 保全（N2）──
+  describe('v6 applyModule（modules[owner] 集成位）', () => {
+    function harnessWithModule(): Harness & { writeManifest(): void } {
+      const base = harness();
+      const writeManifest = (): void => {
+        writeAppFile(
+          base.app.appDir,
+          'packages/module-parking/tbox.module.json',
+          JSON.stringify({
+            schemaVersion: 1, id: 'module-parking', version: '0.1.0', kind: 'business',
+            // v7 词汇统一：展示名 name——双键写侧寻址（展示名 → 落盘键恒真实 id）用例数据
+            name: '停车缴费',
+            declare: { owns: [{ service: 'parking.query' }] },
+          }),
+        );
+      };
+      writeManifest();
+      return { ...base, writeManifest };
+    }
+
+    it('v6-G1 PUT {provider} 落位 modules[install id]；既有 resources 保全（N2）', async () => {
+      const h2 = harnessWithModule();
+      writeAppFile(h2.app.appDir, INTEGRATIONS_FILE, JSON.stringify({
+        services: {},
+        modules: { 'module-parking': { resources: { kb: { type: 'knowledge', datasetId: 'd' } } } },
+      }, null, 2));
+      const r = await h2.tk.writeModuleIntegration('module-parking', { provider: 'wanda' });
+      expect(r.written).toBe(true);
+      const cfg = h2.readConfig();
+      expect(cfg.modules).toEqual({
+        'module-parking': { provider: 'wanda', resources: { kb: { type: 'knowledge', datasetId: 'd' } } },
+      });
+      h2.app.dispose();
+    });
+
+    it('v7 双键写侧：展示名寻址 PUT → 落盘键恒解析回真实 id', async () => {
+      const h2 = harnessWithModule();
+      writeAppFile(h2.app.appDir, INTEGRATIONS_FILE, JSON.stringify({ services: {} }, null, 2));
+      const r = await h2.tk.writeModuleIntegration('停车缴费', { provider: 'wanda' });
+      expect(r.written).toBe(true);
+      const cfg = h2.readConfig();
+      expect(Object.keys(cfg.modules ?? {})).toEqual(['module-parking']);
+      expect((cfg.modules as Record<string, unknown>)['module-parking']).toEqual({ provider: 'wanda' });
+      h2.app.dispose();
+    });
+
+    it('v6-G2 PUT {} 清 provider/config 双键、resources 恒保全（N2 golden）；节点净空 → 删除', async () => {
+      const h2 = harnessWithModule();
+      writeAppFile(h2.app.appDir, INTEGRATIONS_FILE, JSON.stringify({
+        services: {},
+        modules: {
+          'module-parking': { provider: 'wanda', config: { baseUrl: 'x' }, resources: { kb: { type: 'knowledge', datasetId: 'd' } } },
+          'module-bare': { provider: 'mock' },
+        },
+      }, null, 2));
+      writeAppFile(h2.app.appDir, 'packages/module-bare/tbox.module.json', JSON.stringify({
+        schemaVersion: 1, id: 'module-bare', version: '0.1.0', kind: 'business',
+        declare: { owns: [{ service: 'member.account' }] },
+      }));
+      await h2.tk.writeModuleIntegration('module-parking', {});
+      await h2.tk.writeModuleIntegration('module-bare', {});
+      const cfg = h2.readConfig();
+      expect(cfg.modules).toEqual({
+        'module-parking': { resources: { kb: { type: 'knowledge', datasetId: 'd' } } }, // resources 保全
+        // module-bare 节点净空 → 键删除
+      });
+      h2.app.dispose();
+    });
+
+    it('v6-G3 键集纪律：node 含 provider/config 外键 → 400（fail-visible）；零归属模块 → 400', async () => {
+      const h2 = harnessWithModule();
+      await expect(h2.tk.writeModuleIntegration('module-parking', { provider: 'x', resources: { k: {} } } as never))
+        .rejects.toMatchObject({ code: 'VALIDATION_FAILED', httpStatus: 400 });
+      // 零归属模块（declare.owns 空）
+      writeAppFile(h2.app.appDir, 'packages/module-zero/tbox.module.json', JSON.stringify({
+        schemaVersion: 1, id: 'module-zero', version: '0.1.0', kind: 'business', declare: {},
+      }));
+      await expect(h2.tk.writeModuleIntegration('module-zero', { provider: 'x' }))
+        .rejects.toMatchObject({ code: 'VALIDATION_FAILED', httpStatus: 400, message: expect.stringContaining('declare.owns') });
+      h2.app.dispose();
+    });
+  });
+
   it('AppToolkitError 面：code/httpStatus/fields 结构化（消费面属性分发）', () => {
     const err = new AppToolkitError('VALIDATION_FAILED', 400, 'm', ['a.b']);
     expect(err.name).toBe('AppToolkitError');
@@ -285,3 +368,37 @@ describe('写核心管线（FX-1c）', () => {
     expect(err.fields).toEqual(['a.b']);
   });
 });
+
+describe('孤儿凭据写后对账（PUT 路径追平——finalize 单点）', () => {
+  let h: Harness;
+  beforeEach(() => {
+    h = harness();
+  });
+  afterEach(() => {
+    h.app.dispose();
+  });
+
+  it('P1 PUT 替换弃 credentialRef → ORPHANED_CREDENTIAL warning（message 含被弃 stem）', async () => {
+    writeAppFile(h.app.appDir, 'config/credentials/wd-parking.json', JSON.stringify({ type: 'wanda-c', k: 'v' }));
+    await h.tk.writeServiceIntegration('parking.query', {
+      provider: 'wanda', implementation: 'w@1', credentialRef: 'secret://wd-parking',
+    } as never);
+    const r = await h.tk.writeServiceIntegration('parking.query', {} as never);
+    expect(r.written).toBe(true);
+    const orphan = r.issues.find((i) => i.code === 'ORPHANED_CREDENTIAL');
+    expect(orphan).toBeTruthy();
+    expect(orphan?.message).toContain('wd-parking');
+  });
+
+  it('P2 真写报全量孤儿 / dryRun 不报 / no-diff 不报', async () => {
+    writeAppFile(h.app.appDir, 'config/credentials/stray.json', JSON.stringify({ type: 'x', k: 'v' }));
+    const node = { provider: 'wanda', implementation: 'w@1' } as never;
+    const dry = await h.tk.writeServiceIntegration('parking.query', node, { dryRun: true });
+    expect(dry.issues.some((i) => i.code === 'ORPHANED_CREDENTIAL')).toBe(false);
+    const real = await h.tk.writeServiceIntegration('parking.query', node);
+    expect(real.issues.some((i) => i.code === 'ORPHANED_CREDENTIAL' && i.message.includes('stray'))).toBe(true);
+    const nodiff = await h.tk.writeServiceIntegration('parking.query', node);
+    expect(nodiff.written).toBe(false);
+    expect(nodiff.issues.some((i) => i.code === 'ORPHANED_CREDENTIAL')).toBe(false);
+  });
+});

package/dist/chunk-KPD3LUH4.js

@@ -1 +0,0 @@
-import{existsSync as l,readdirSync as F,realpathSync as m}from"fs";import{join as c}from"path";import{pathToFileURL as w}from"url";import{existsSync as T,readFileSync as k,statSync as x}from"fs";function p(){let e=new Map,n=0;function r(t){if(!T(t))return null;let i=x(t);return`${i.mtimeMs}:${i.size}`}return{read(t,i){let o=r(t);if(o===null){e.delete(t);return}let s=e.get(t);if(s&&s.fingerprint===o)return s.value;n+=1;let a=i(k(t,"utf8"));return e.set(t,{fingerprint:o,value:a}),a},invalidate(t){if(t===void 0){e.clear();return}for(let i of t)e.delete(i)},get parseCount(){return n}}}var g=["resolveEffectiveService","buildSupplyLookup","moduleDomainOf","normalizeInstances","RESOURCE_TYPE_IDS"],M="parseIntegrationsConfig",v={version:null,evaluation:!1,strictValidation:!1,module:{},notes:[]};function C(e){let n=[e];for(let r of["apps","packages"]){let t=c(e,r);if(!l(t))continue;let i=F(t,{withFileTypes:!0}).filter(o=>o.isDirectory()).map(o=>o.name);r==="apps"?i.sort((o,s)=>o==="server"?-1:s==="server"?1:o.localeCompare(s)):i.sort((o,s)=>o.localeCompare(s));for(let o of i)n.push(c(t,o))}return n}var d=new Map,h=p();function y(e){return h.read(e,n=>{let r=JSON.parse(n);return typeof r.version=="string"?r.version:null})??null}function b(e){if(!l(e))return"gone";let n;try{n=m(e)}catch{n=e}return l(c(n,"dist","runtime.js"))?"dist":l(c(n,"src","runtime.ts"))?"src":"none"}function R(e){let n=c(e,"package.json");return{pkgPath:n,candidateDir:e,version:y(n),artifact:b(e)}}function E(e){for(let n of C(e)){let r=c(n,"node_modules","@tbox.cn","app-contracts"),t=c(r,"package.json");if(l(t))return{pkgPath:t,candidateDir:r,version:y(t),artifact:b(r)}}return null}function u(e){return e===null?"none":`${e.pkgPath}|${e.version??"null"}|${e.artifact}`}function $(e,n){let r=E(e);if(u(r)!==u(n.first))return!1;if(n.resolved===null)return!0;let t=r!==null&&r.candidateDir===n.resolved.candidateDir?r:R(n.resolved.candidateDir);return u(t)===u(n.resolved)}async function O(e,n){if(!l(e))return null;let r;try{r=m(e)}catch{return null}let i=[c(r,"dist","runtime.js"),c(r,"src","runtime.ts")].find(s=>l(s)),o=h.read(c(e,"package.json"),s=>{let a=JSON.parse(s);return typeof a.version=="string"?a.version:null})??null;if(i===void 0)return n.push(`contracts ${o??"(版本未知)"} 探测命中但无构建产物（dist/runtime.js 缺失）——workspace 源码态未构建：执行 pnpm --filter @tbox.cn/app-contracts build 后重试`),null;try{let s=o!==null?`?v=${encodeURIComponent(o)}`:"",a=await import(w(i).href+s),f=g.every(S=>a[S]!==void 0),P=a[M]!==void 0;return{version:o,evaluation:f,strictValidation:P,module:a,notes:f?[]:[`${i} 命中但求值面具名导出缺席（${g.join("/")}）——契约包形态异常`]}}catch(s){return n.push(`contracts ${o??"(版本未知)"} 构建产物导入失败（${s instanceof Error?s.message:String(s)}）——workspace 源码态未构建或产物损坏：执行 pnpm --filter @tbox.cn/app-contracts build 后重试`),null}}function U(e){let n=d.get(e);if(n&&$(e,n))return n.promise;let r=E(e),t={promise:Promise.resolve({...v}),first:r,resolved:r};return t.promise=(async()=>{let i=[];for(let o of C(e)){let s=c(o,"node_modules","@tbox.cn","app-contracts"),a=await O(s,i);if(a)return a.version!==null&&!a.strictValidation&&a.notes.push(`contracts ${a.version} 无严格校验面（需 ≥0.9.0）——升级应用 @tbox.cn/app-contracts 依赖后可用`),t.resolved=R(s),a}return t.resolved=null,i.length===0&&i.push("contracts 不可解析（未安装）——检查应用依赖安装后重试"),{...v,notes:i}})(),d.set(e,t),t.promise}function L(e){e===void 0?d.clear():d.delete(e)}export{p as a,U as b,L as c};

package/dist/contracts-resolver-E4SECBOG.js

@@ -1 +0,0 @@
-import{b as a,c as b}from"./chunk-KPD3LUH4.js";export{b as invalidateContractsResolver,a as resolveContractsForApp};

package/src/integrations/domain-binding.ts

@@ -1,81 +0,0 @@
-import type { WalkCatalog, WalkManifestsResult, WalkModuleInfo } from '../assembly/walk-manifests.js';
-
-/**
- * 域级联绑定单源（v4.4 F1/F3——integrations 层落位依据：谓词（同层）/ 写核（同层）/
- * views（下层可向上 import）三向消费的唯一公共下层；import 前缀 guard 覆盖）。
- *
- * 知识锚（module-tab note 单源锚表）：
- *   域级联（值 + 层）  = resolveDomainBinding —— 谓词 #7（等价重构，语义 ≡
- *                        `domains[d].provider ?? root.provider`）/ deriveBindingLayer 域级段 /
- *                        buildInheritance module 段 / ProviderBinding
- *   来源层四层推导     = deriveBindingLayer（views/service-resolutions，域级段改调本文件）
- *   写通道可用性       = moduleDomainWritable —— configEditable 读标志 / applyModule 400 守卫共用
- *                        （D34：读标志与写守卫一函数）
- */
-
-/** 域前缀换算（service → 首点段；自 views/context.ts 迁入——文件格式词汇，静态面零 contracts 依赖） */
-export function domainOfService(service: string): string {
-  const i = service.indexOf('.');
-  return i === -1 ? service : service.slice(0, i);
-}
-
-/** 域级联绑定解析（值 + 来源层）：provider 取非空字符串（域级优先 → root 兜底；空串 = 缺席）。
- *  layer：域级声明 → 'module'；root 兜底 → 'app'；双缺 → null（ProviderBinding 双缺诚实态）。 */
-export function resolveDomainBinding(
-  config: Record<string, unknown> | null,
-  domainKey: string,
-): { provider: string | null; layer: 'module' | 'app' | null } {
-  const domainProvider = (config?.domains as Record<string, { provider?: unknown }> | undefined)?.[domainKey]?.provider;
-  if (typeof domainProvider === 'string' && domainProvider.length > 0) {
-    return { provider: domainProvider, layer: 'module' };
-  }
-  const rootProvider = config?.provider;
-  if (typeof rootProvider === 'string' && rootProvider.length > 0) {
-    return { provider: rootProvider, layer: 'app' };
-  }
-  return { provider: null, layer: null };
-}
-
-/** 多域模块可写性（D34 判别联合——configEditable 读标志与 applyModule 写守卫共用单源） */
-export type ModuleDomainWritability =
-  | { writable: true; domainKeys: [string]; domainKey: string }
-  | { writable: false; reason: 'zero-domain'; domainKeys: [] }
-  | { writable: false; reason: 'multi-domain'; domainKeys: string[] }
-  | { writable: false; reason: 'shared-key'; domainKeys: [string]; domainKey: string; coOwners: string[] };
-
-/**
- * 多域模块可写性判定（v4.4 F3）：domainKeys = demand 服务首段去重；
- * shared-key 判据 = 域级 owner 并集计数（catalog.services 聚合含 dev-manifest 通道需求——
- * P13 真源；>1 个 distinct owner ⟺ 共享。免 owner↔moduleId 身份映射——本地模块 catalog
- * owner = entry.package ≠ mod.pkg `@app/<id>`，身份比较必踩；「他方与本模块需求同一服务」
- * 形态亦被并集计数天然覆盖）。
- */
-export function moduleDomainWritable(
-  walk: Pick<WalkManifestsResult, 'modules' | 'catalog'>,
-  mod: WalkModuleInfo,
-): ModuleDomainWritability {
-  const domainKeys = [...new Set((mod.descriptor.contributes.services ?? []).map((s) => domainOfService(s.service)))].sort();
-  if (domainKeys.length === 0) return { writable: false, reason: 'zero-domain', domainKeys: [] };
-  if (domainKeys.length > 1) return { writable: false, reason: 'multi-domain', domainKeys };
-  const domainKey = domainKeys[0];
-  const owners = new Set<string>();
-  for (const [service, demand] of Object.entries(walk.catalog.services)) {
-    if (domainOfService(service) === domainKey) for (const o of demand.owners) owners.add(o);
-  }
-  if (owners.size > 1) {
-    return { writable: false, reason: 'shared-key', domainKeys: [domainKey], domainKey, coOwners: [...owners].sort() };
-  }
-  return { writable: true, domainKeys: [domainKey], domainKey };
-}
-
-/** owner 串 → 显示名（尽力映射 module install id；未命中回退原始串——message 质量问题非正确性） */
-export function displayOwnerName(modules: ReadonlyArray<{ id: string; pkg: string }>, owner: string): string {
-  const mod = modules.find((m) => m.pkg === owner || `@app/${m.id}` === owner);
-  if (mod) return mod.id;
-  return owner.startsWith('@app/') ? owner.slice('@app/'.length) : owner;
-}
-
-/** 供给足迹（该厂商全部供给服务并集——应用级 integrationSchemas 作用域，D32） */
-export function providerFootprint(catalog: WalkCatalog, provider: string): string[] {
-  return [...new Set(Object.values(catalog.providers[provider] ?? {}).flatMap((e) => e.services))].sort();
-}