openxiangda-contracts 2.14.0 → 2.15.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/data-view-validation.d.ts.map +1 -1
- package/dist/data-view-validation.js +3 -1
- package/dist/data-view-validation.js.map +1 -1
- package/dist/native-compiler/compiler.d.ts.map +1 -1
- package/dist/native-compiler/compiler.js +116 -6
- package/dist/native-compiler/compiler.js.map +1 -1
- package/dist/native-compiler/data-audit-access.d.ts +8 -0
- package/dist/native-compiler/data-audit-access.d.ts.map +1 -1
- package/dist/native-compiler/data-audit-access.js +11 -0
- package/dist/native-compiler/data-audit-access.js.map +1 -1
- package/dist/native-compiler/index.cjs +4 -4
- package/dist/native-compiler/index.js +4 -4
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-view-validation.d.ts","sourceRoot":"","sources":["../src/data-view-validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"data-view-validation.d.ts","sourceRoot":"","sources":["../src/data-view-validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAI7C,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,UAAU,EAAE,CAO1F;AAaD,sFAAsF;AACtF,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,UAAU,EAAE,CA6Nd"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isDataSystemSortField } from './native-compiler/data-audit-access.js';
|
|
1
2
|
import { diagnostic, isRecord } from './validation-common.js';
|
|
2
3
|
export function validateDataResourceListActions(value, path) {
|
|
3
4
|
if (value === undefined)
|
|
@@ -132,7 +133,8 @@ export function validateDataResourceViews(resource) {
|
|
|
132
133
|
issue('排序必须声明字段', `${path}.list.defaultSort`);
|
|
133
134
|
else {
|
|
134
135
|
exact(sort, ['field', 'order'], `${path}.list.defaultSort`);
|
|
135
|
-
|
|
136
|
+
// 平台系统列（如 created_at/updated_at）无需字段声明即可作为排序字段。
|
|
137
|
+
selection(isDataSystemSortField(String(sort.field)) ? [] : [sort.field], `${path}.list.defaultSort.field`);
|
|
136
138
|
if (sort.order !== undefined &&
|
|
137
139
|
!['asc', 'desc'].includes(String(sort.order)))
|
|
138
140
|
issue('排序方向无效', `${path}.list.defaultSort.order`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-view-validation.js","sourceRoot":"","sources":["../src/data-view-validation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"data-view-validation.js","sourceRoot":"","sources":["../src/data-view-validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../src/native-compiler/compiler.ts"],"names":[],"mappings":"AAUA,OAAO,EAEL,KAAK,kCAAkC,IAAI,uCAAuC,EACnF,MAAM,aAAa,CAAC;AAwBrB,QAAA,MAAM,iBAAiB,mDAAmD,CAAC;AAC3E,QAAA,MAAM,yBAAyB,YAA2C,CAAC;AAgF3E,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;EAc7B,CAAC;AACZ,eAAO,MAAM,mBAAmB,6HAItB,CAAC;AACX,eAAO,MAAM,uBAAuB,u/CAkC1B,CAAC;AAGX,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEtC,MAAM,WAAW,gCAAgC;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;IAC1C,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;IAC5C,oBAAoB,EAAE,MAAM,CAAC;IAC7B,sBAAsB,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,6BAA6B,CAAC,CAAC,GAAG,UAAU;IAC3D,KAAK,EAAE,CAAC,CAAC;IACT,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iCAAiC;IAChD,aAAa,EAAE,OAAO,iBAAiB,CAAC;IACxC,uBAAuB,EAAE,OAAO,yBAAyB,CAAC;IAC1D,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE;QACN,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,EAAE,MAAM,CAAC;QACvB,gBAAgB,EAAE,MAAM,CAAC;KAC1B,CAAC;IACF,WAAW,EAAE;QACX,KAAK,EAAE,6BAA6B,CAAC;QACrC,IAAI,EAAE,6BAA6B,CAAC;QACpC,MAAM,EAAE,6BAA6B,CAAC;QACtC,SAAS,EAAE,6BAA6B,CAAC;QACzC,OAAO,EAAE,6BAA6B,CAAC;QACvC,SAAS,EAAE,6BAA6B,CAAC;KAC1C,CAAC;IACF,4BAA4B,EAAE,uCAAuC,EAAE,CAAC;IACxE,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,gCAAiC,SAAQ,KAAK;IACzD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAG3C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,WAAW,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;CAY5C;AAED,wBAAgB,qCAAqC,CACnD,KAAK,EAAE,gCAAgC,GACtC,iCAAiC,
|
|
1
|
+
{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../src/native-compiler/compiler.ts"],"names":[],"mappings":"AAUA,OAAO,EAEL,KAAK,kCAAkC,IAAI,uCAAuC,EACnF,MAAM,aAAa,CAAC;AAwBrB,QAAA,MAAM,iBAAiB,mDAAmD,CAAC;AAC3E,QAAA,MAAM,yBAAyB,YAA2C,CAAC;AAgF3E,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;EAc7B,CAAC;AACZ,eAAO,MAAM,mBAAmB,6HAItB,CAAC;AACX,eAAO,MAAM,uBAAuB,u/CAkC1B,CAAC;AAGX,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEtC,MAAM,WAAW,gCAAgC;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;IAC1C,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;IAC5C,oBAAoB,EAAE,MAAM,CAAC;IAC7B,sBAAsB,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,6BAA6B,CAAC,CAAC,GAAG,UAAU;IAC3D,KAAK,EAAE,CAAC,CAAC;IACT,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iCAAiC;IAChD,aAAa,EAAE,OAAO,iBAAiB,CAAC;IACxC,uBAAuB,EAAE,OAAO,yBAAyB,CAAC;IAC1D,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE;QACN,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,EAAE,MAAM,CAAC;QACvB,gBAAgB,EAAE,MAAM,CAAC;KAC1B,CAAC;IACF,WAAW,EAAE;QACX,KAAK,EAAE,6BAA6B,CAAC;QACrC,IAAI,EAAE,6BAA6B,CAAC;QACpC,MAAM,EAAE,6BAA6B,CAAC;QACtC,SAAS,EAAE,6BAA6B,CAAC;QACzC,OAAO,EAAE,6BAA6B,CAAC;QACvC,SAAS,EAAE,6BAA6B,CAAC;KAC1C,CAAC;IACF,4BAA4B,EAAE,uCAAuC,EAAE,CAAC;IACxE,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,gCAAiC,SAAQ,KAAK;IACzD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAG3C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,WAAW,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;CAY5C;AAED,wBAAgB,qCAAqC,CACnD,KAAK,EAAE,gCAAgC,GACtC,iCAAiC,CA+InC;AAED;;;GAGG;AACH,wBAAgB,qCAAqC,CACnD,MAAM,EAAE,UAAU,GACjB,uCAAuC,EAAE,CA2R3C;AAED,MAAM,WAAW,wBAAwB;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC/B;AAED;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,KAAK,EAAE;IACtD,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,YAAY,EAAE,UAAU,EAAE,CAAC;IAC3B,aAAa,EAAE,UAAU,EAAE,CAAC;IAC5B,eAAe,CAAC,EAAE,UAAU,EAAE,CAAC;CAChC,GAAG,wBAAwB,EAAE,CA4J7B"}
|
|
@@ -181,6 +181,7 @@ export function compileNativeApplicationConfiguration(input) {
|
|
|
181
181
|
validateConfigurationEnvelope(config, appCode);
|
|
182
182
|
validateContractEnvelope(contract, appCode, expectedConfigDigest);
|
|
183
183
|
const expectedContract = compileExpectedContract(config, expectedConfigDigest, contract.generatorVersion);
|
|
184
|
+
mergeUserSurfaceRoutes(expectedContract, contract, config);
|
|
184
185
|
if (canonicalJson(expectedContract) !== canonicalJson(contract)) {
|
|
185
186
|
fail('NATIVE_CONTRACT_CLOSURE_MISMATCH', firstDifferencePointer(expectedContract, contract, '/contracts'));
|
|
186
187
|
}
|
|
@@ -1531,6 +1532,11 @@ function validateApplicationAuthentication(value, routeDeclarations, config, poi
|
|
|
1531
1532
|
const route = object(rawRoute, `/config/frontend/routes/${index}`);
|
|
1532
1533
|
routesByCode.set(String(route.code || ''), route);
|
|
1533
1534
|
}
|
|
1535
|
+
// 生成式用户标准面路由码：user.<resource>.(records|submit)。路由事实
|
|
1536
|
+
// 由 routeManifest 携带；这里按同应用已声明资源判定有效性。
|
|
1537
|
+
const userSurfaceResourceCodes = new Set((Array.isArray(config.data?.resources) ? config.data.resources : [])
|
|
1538
|
+
.map(resource => String(resource.code || ''))
|
|
1539
|
+
.filter(code => /^[a-z][a-z0-9-]{0,62}$/.test(code)));
|
|
1534
1540
|
for (const [device, surface] of [
|
|
1535
1541
|
['desktop', desktop],
|
|
1536
1542
|
['mobile', mobile],
|
|
@@ -1538,8 +1544,16 @@ function validateApplicationAuthentication(value, routeDeclarations, config, poi
|
|
|
1538
1544
|
if (routesByCode.has(surface.routeCode)) {
|
|
1539
1545
|
fail('NATIVE_APPLICATION_AUTH_SURFACE_CODE_CONFLICT', `${pointer}/surfaces/${device}/routeCode`);
|
|
1540
1546
|
}
|
|
1541
|
-
const
|
|
1542
|
-
|
|
1547
|
+
const generatedUserRoute = /^user\.([a-z][a-z0-9-]{0,62})\.(records|submit)$/.exec(String(surface.defaultRouteCode || ''));
|
|
1548
|
+
let defaultRoute = routesByCode.get(surface.defaultRouteCode);
|
|
1549
|
+
let defaultPath = String(defaultRoute?.path || '');
|
|
1550
|
+
if (generatedUserRoute && userSurfaceResourceCodes.has(generatedUserRoute[1])) {
|
|
1551
|
+
const base = generatedUserRoute[2] === 'records'
|
|
1552
|
+
? `/my/${generatedUserRoute[1]}`
|
|
1553
|
+
: `/my/${generatedUserRoute[1]}/submit`;
|
|
1554
|
+
defaultRoute = { surface: 'user', path: device === 'mobile' ? `/m${base}` : base };
|
|
1555
|
+
defaultPath = String(defaultRoute.path);
|
|
1556
|
+
}
|
|
1543
1557
|
const deviceMismatch = device === 'desktop'
|
|
1544
1558
|
? defaultPath === '/m' || defaultPath.startsWith('/m/')
|
|
1545
1559
|
: !(defaultPath === '/m' || defaultPath.startsWith('/m/'));
|
|
@@ -2441,6 +2455,8 @@ const ROUTE_MANIFEST_KINDS = new Set([
|
|
|
2441
2455
|
'workflow-launch',
|
|
2442
2456
|
'workflow-task',
|
|
2443
2457
|
'workflow-instance',
|
|
2458
|
+
'resource-records',
|
|
2459
|
+
'resource-submit',
|
|
2444
2460
|
]);
|
|
2445
2461
|
function validateRouteManifest(value, pointer, appCode) {
|
|
2446
2462
|
const manifest = object(value, pointer);
|
|
@@ -2464,8 +2480,10 @@ function validateRouteManifest(value, pointer, appCode) {
|
|
|
2464
2480
|
routes.forEach((rawEntry, index) => {
|
|
2465
2481
|
const entryPointer = `${pointer}/routes/${index}`;
|
|
2466
2482
|
const entry = object(rawEntry, entryPointer);
|
|
2483
|
+
const resourceKinds = entry.kind === 'resource-records' || entry.kind === 'resource-submit';
|
|
2467
2484
|
exactKeys(entry, ['code', 'kind', 'desktop', 'mobile'], entryPointer, [
|
|
2468
2485
|
'workflowCode',
|
|
2486
|
+
...(resourceKinds ? ['resourceCode'] : []),
|
|
2469
2487
|
]);
|
|
2470
2488
|
const code = requiredString(entry.code, `${entryPointer}/code`, 255);
|
|
2471
2489
|
if (codes.has(code))
|
|
@@ -2478,6 +2496,13 @@ function validateRouteManifest(value, pointer, appCode) {
|
|
|
2478
2496
|
if (entry.workflowCode !== undefined) {
|
|
2479
2497
|
stableCode(entry.workflowCode, `${entryPointer}/workflowCode`);
|
|
2480
2498
|
}
|
|
2499
|
+
if (resourceKinds) {
|
|
2500
|
+
const resourceCodeValue = resourceCode(entry.resourceCode, `${entryPointer}/resourceCode`);
|
|
2501
|
+
equal(code, `user.${resourceCodeValue}.${entry.kind === 'resource-records' ? 'records' : 'submit'}`, `${entryPointer}/code`);
|
|
2502
|
+
}
|
|
2503
|
+
else if (entry.resourceCode !== undefined) {
|
|
2504
|
+
fail('NATIVE_PROPERTY_UNKNOWN', `${entryPointer}/resourceCode`);
|
|
2505
|
+
}
|
|
2481
2506
|
const desktop = validateRouteManifestRoute(entry.desktop, `${entryPointer}/desktop`, appCode);
|
|
2482
2507
|
const mobile = validateRouteManifestRoute(entry.mobile, `${entryPointer}/mobile`, appCode);
|
|
2483
2508
|
if (desktop.surface !== 'user') {
|
|
@@ -2593,25 +2618,41 @@ function compileRouteManifestRoute(routeCode, path, surface, page) {
|
|
|
2593
2618
|
requiresAuthentication: true,
|
|
2594
2619
|
};
|
|
2595
2620
|
}
|
|
2596
|
-
function standardRouteCode(kind, device, workflowCode) {
|
|
2621
|
+
function standardRouteCode(kind, device, workflowCode, resourceCode) {
|
|
2597
2622
|
if (kind === 'workflow-launch') {
|
|
2598
2623
|
return `workflow.${workflowCode}.launch.${device}`;
|
|
2599
2624
|
}
|
|
2600
2625
|
if (kind === 'application-todo-center') {
|
|
2601
2626
|
return `application.todo-center.${device}`;
|
|
2602
2627
|
}
|
|
2628
|
+
if (kind === 'resource-records') {
|
|
2629
|
+
return `user.${resourceCode}.records.${device}`;
|
|
2630
|
+
}
|
|
2631
|
+
if (kind === 'resource-submit') {
|
|
2632
|
+
return `user.${resourceCode}.submit.${device}`;
|
|
2633
|
+
}
|
|
2603
2634
|
return `${kind.replace(/-/g, '.')}.${device}`;
|
|
2604
2635
|
}
|
|
2636
|
+
function resourceCapabilitiesOf(appCode, resourceCodeValue) {
|
|
2637
|
+
const prefix = `app:${appCode}:data:${resourceCodeValue}`;
|
|
2638
|
+
return {
|
|
2639
|
+
read: `${prefix}:read`,
|
|
2640
|
+
create: `${prefix}:create`,
|
|
2641
|
+
update: `${prefix}:update`,
|
|
2642
|
+
delete: `${prefix}:delete`,
|
|
2643
|
+
};
|
|
2644
|
+
}
|
|
2605
2645
|
function compileRouteManifest(config) {
|
|
2606
2646
|
const appCode = config.appCode;
|
|
2607
2647
|
const routes = [];
|
|
2608
|
-
const addRoute = (code, kind, desktopPath, mobilePath, workflowCode, access) => {
|
|
2648
|
+
const addRoute = (code, kind, desktopPath, mobilePath, workflowCode, access, resourceCodeValue) => {
|
|
2609
2649
|
routes.push({
|
|
2610
2650
|
code,
|
|
2611
2651
|
kind,
|
|
2612
2652
|
...(workflowCode ? { workflowCode } : {}),
|
|
2613
|
-
|
|
2614
|
-
|
|
2653
|
+
...(resourceCodeValue ? { resourceCode: resourceCodeValue } : {}),
|
|
2654
|
+
desktop: compileRouteManifestRoute(standardRouteCode(kind, 'desktop', workflowCode, resourceCodeValue), desktopPath, 'user', access),
|
|
2655
|
+
mobile: compileRouteManifestRoute(standardRouteCode(kind, 'mobile', workflowCode, resourceCodeValue), mobilePath, 'user', access),
|
|
2615
2656
|
});
|
|
2616
2657
|
};
|
|
2617
2658
|
if (config.frontend.user.applicationTodoCenter === true) {
|
|
@@ -4131,6 +4172,75 @@ function validateWorkflowDefinitionBinding(definition, binding, pointer) {
|
|
|
4131
4172
|
}
|
|
4132
4173
|
}
|
|
4133
4174
|
}
|
|
4175
|
+
/**
|
|
4176
|
+
* 生成式用户标准面的路由事实由工具链编译器产出；配置 bundle 不携带
|
|
4177
|
+
* userSurface。闭合时按配置事实校验这些路由（资源存在、能力等于该资源
|
|
4178
|
+
* read/create、路径与码形状稳定），通过后并入期望契约并重算清单摘要。
|
|
4179
|
+
* 路由本身仍受能力门禁约束，注入不产生任何额外授权。
|
|
4180
|
+
*/
|
|
4181
|
+
function mergeUserSurfaceRoutes(expectedContract, contract, config) {
|
|
4182
|
+
const manifest = object(contract.routeManifest, '/contracts/routeManifest');
|
|
4183
|
+
const expectedManifest = object(expectedContract.routeManifest, '/contracts/routeManifest');
|
|
4184
|
+
const resources = new Map();
|
|
4185
|
+
for (const raw of boundedArray(config.data?.resources, '/config/data/resources', 100)) {
|
|
4186
|
+
const resource = object(raw, '/config/data/resources');
|
|
4187
|
+
resources.set(String(resource.code || ''), resource);
|
|
4188
|
+
}
|
|
4189
|
+
const existingCodes = new Set(boundedArray(expectedManifest.routes, '/contracts/routeManifest/routes', 1000).map(entry => String(object(entry, '/contracts/routeManifest/routes').code || '')));
|
|
4190
|
+
const accepted = [];
|
|
4191
|
+
for (const rawEntry of boundedArray(manifest.routes, '/contracts/routeManifest/routes', 1000)) {
|
|
4192
|
+
const entry = object(rawEntry, '/contracts/routeManifest/routes');
|
|
4193
|
+
const kind = String(entry.kind || '');
|
|
4194
|
+
if (kind !== 'resource-records' && kind !== 'resource-submit')
|
|
4195
|
+
continue;
|
|
4196
|
+
const resourceCodeValue = String(entry.resourceCode || '');
|
|
4197
|
+
const resource = resources.get(resourceCodeValue);
|
|
4198
|
+
if (!resource) {
|
|
4199
|
+
fail('NATIVE_ROUTE_MANIFEST_RESOURCE_UNKNOWN', `/contracts/routeManifest/routes`);
|
|
4200
|
+
}
|
|
4201
|
+
const suffix = kind === 'resource-records' ? 'records' : 'submit';
|
|
4202
|
+
const code = `user.${resourceCodeValue}.${suffix}`;
|
|
4203
|
+
equal(String(entry.code || ''), code, '/contracts/routeManifest/routes/code');
|
|
4204
|
+
const operation = kind === 'resource-records' ? 'read' : 'create';
|
|
4205
|
+
const capability = String(object(resource.capabilities, '/config/data/resources/capabilities')[operation] || '');
|
|
4206
|
+
for (const device of ['desktop', 'mobile']) {
|
|
4207
|
+
const route = object(entry[device], `/contracts/routeManifest/routes/${device}`);
|
|
4208
|
+
const prefix = device === 'mobile' ? '/m/my/' : '/my/';
|
|
4209
|
+
const suffixPath = kind === 'resource-records'
|
|
4210
|
+
? `${prefix}${resourceCodeValue}`
|
|
4211
|
+
: `${prefix}${resourceCodeValue}/submit`;
|
|
4212
|
+
equal(String(route.path || ''), suffixPath, `/contracts/routeManifest/routes/${device}/path`);
|
|
4213
|
+
equal(String(route.capability || ''), capability, `/contracts/routeManifest/routes/${device}/capability`);
|
|
4214
|
+
equal(String(route.routeCode || ''), `${code}.${device}`, `/contracts/routeManifest/routes/${device}/routeCode`);
|
|
4215
|
+
}
|
|
4216
|
+
if (existingCodes.has(code) || accepted.some(item => String(item.code) === code)) {
|
|
4217
|
+
fail('NATIVE_ROUTE_MANIFEST_DUPLICATE', '/contracts/routeManifest/routes/code');
|
|
4218
|
+
}
|
|
4219
|
+
accepted.push(entry);
|
|
4220
|
+
}
|
|
4221
|
+
if (!accepted.length)
|
|
4222
|
+
return;
|
|
4223
|
+
expectedManifest.routes = boundedArray([...expectedManifest.routes, ...accepted], '/contracts/routeManifest/routes', 1000).sort((left, right) => compareText(String(object(left, 'x').code || ''), String(object(right, 'x').code || '')));
|
|
4224
|
+
// rootEntry 指向已接受的 records 路由时同样并入。
|
|
4225
|
+
const rootCode = String(object(manifest.rootEntry, 'x').code || '');
|
|
4226
|
+
const homeEntry = accepted.find(entry => String(entry.code) === rootCode && entry.kind === 'resource-records');
|
|
4227
|
+
if (homeEntry) {
|
|
4228
|
+
const root = object(manifest.rootEntry, 'x');
|
|
4229
|
+
expectedManifest.rootEntry = {
|
|
4230
|
+
code: rootCode,
|
|
4231
|
+
desktop: String(root.desktop || ''),
|
|
4232
|
+
mobile: String(root.mobile || ''),
|
|
4233
|
+
};
|
|
4234
|
+
}
|
|
4235
|
+
expectedManifest.digest = sha256Canonical({
|
|
4236
|
+
schemaVersion: expectedManifest.schemaVersion,
|
|
4237
|
+
appCode: expectedManifest.appCode,
|
|
4238
|
+
devicePolicy: expectedManifest.devicePolicy,
|
|
4239
|
+
rootEntry: expectedManifest.rootEntry,
|
|
4240
|
+
authentication: expectedManifest.authentication,
|
|
4241
|
+
routes: expectedManifest.routes,
|
|
4242
|
+
});
|
|
4243
|
+
}
|
|
4134
4244
|
function validateResource(raw, pointer, appCode) {
|
|
4135
4245
|
const resource = object(raw, pointer);
|
|
4136
4246
|
exactKeys(resource, [
|