Use explicit navigation projections for React presentation readiness (#339)
This commit is contained in:
parent
bc9a7ef2cf
commit
ee84025322
@@ -41,15 +41,19 @@ export function presentationQueries(pkg: PackageRevision, interfaces: readonly I
|
||||
];
|
||||
});
|
||||
const stem = `PresentationNavigation${createHash("sha256").update(id).digest("hex").slice(0, 12)}`;
|
||||
const inputs = `presentation:navigation:${id}:inputs`;
|
||||
for (const local of [false, true]) {
|
||||
const name = `${stem}${local ? "View" : "Inputs"}`;
|
||||
const document = `generated/${name}.graphql`;
|
||||
documents.set(
|
||||
document,
|
||||
`query ${name}($presentationMount: QxRef_PresentationMount!) {
|
||||
// Retain full state for operations and hidden occurrences, independently
|
||||
// from the identity projection used to prepare a rendering occurrence.
|
||||
for (const identity of [false, true]) {
|
||||
const prefix = `presentation:navigation:${id}:${identity ? "identity-" : ""}`;
|
||||
const inputs = prefix + "inputs";
|
||||
for (const local of [false, true]) {
|
||||
const name = `${stem}${identity ? "Identity" : ""}${local ? "View" : "Inputs"}`;
|
||||
const document = `generated/${name}.graphql`;
|
||||
documents.set(
|
||||
document,
|
||||
`query ${name}($presentationMount: QxRef_PresentationMount!) {
|
||||
root { ${local ? "availableObjects" : "objects"}(all:512, where:{_camino:{as:{PresentationState:{presentationMount:{eq:$presentationMount}}}}}) {
|
||||
entries { node { ${fields.join("\n")}
|
||||
entries { node { ${identity ? "" : fields.join("\n")}
|
||||
... on PresentationState {
|
||||
_presentationOccurrence: occurrence
|
||||
_presentationSource: source {_camino {ref}}
|
||||
@@ -59,20 +63,21 @@ export function presentationQueries(pkg: PackageRevision, interfaces: readonly I
|
||||
} }
|
||||
} }
|
||||
}`,
|
||||
);
|
||||
generated.push({
|
||||
id: local ? `presentation:navigation:${id}:view` : inputs,
|
||||
displayName: name,
|
||||
root: { kind: "workspace-interface", interface: contract.revisionId },
|
||||
document,
|
||||
operation: name,
|
||||
fragments: [],
|
||||
views: [],
|
||||
allowances: [],
|
||||
budgets: { ...defaultQueryBudgets, rows: 5000, candidates: 5000, resultBytes: 8388608 },
|
||||
watch: local,
|
||||
placement: local ? { kind: "local", sourceQueryId: inputs } : { kind: "replica" },
|
||||
});
|
||||
);
|
||||
generated.push({
|
||||
id: local ? prefix + "view" : inputs,
|
||||
displayName: name,
|
||||
root: { kind: "workspace-interface", interface: contract.revisionId },
|
||||
document,
|
||||
operation: name,
|
||||
fragments: [],
|
||||
views: [],
|
||||
allowances: [],
|
||||
budgets: { ...defaultQueryBudgets, rows: 5000, candidates: 5000, resultBytes: 8388608 },
|
||||
watch: local,
|
||||
placement: local ? { kind: "local", sourceQueryId: inputs } : { kind: "replica" },
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
for (const query of generated)
|
||||
|
||||
@@ -258,17 +258,7 @@ export function generatePackageComponentBindings(
|
||||
target.kind === "atom"
|
||||
? `ManagedReference<"atom", ${JSON.stringify(target.atomId)}>`
|
||||
: `ManagedReference<"interface", ${JSON.stringify(target.interfaceRevisionId)}>`;
|
||||
const fields =
|
||||
target.kind === "interface"
|
||||
? find(target.interfaceRevisionId).members.flatMap((member) => {
|
||||
if ((member.kind !== "value" && member.kind !== "relationship") || !member.queryRead) return [];
|
||||
const getter = member.operations.find(
|
||||
(operation) => operation.displayName === (member.kind === "value" ? "get" : "resolve"),
|
||||
);
|
||||
return getter ? [`readonly ${JSON.stringify(member.displayName)}: ${tsType(getter.outputType)}`] : [];
|
||||
})
|
||||
: [];
|
||||
return `{readonly reference: ${reference}; readonly values: {${fields.join(";")}}}`;
|
||||
return `{readonly reference: ${reference}}`;
|
||||
})
|
||||
.join(",")}]`;
|
||||
const interfaces = generateInterfaceClientBindings(imports, "@quixos/camino-react", props);
|
||||
|
||||
+27
-5
@@ -113,6 +113,13 @@ export function lowerQueryTree(
|
||||
if (!root || selection.some((field) => field !== root))
|
||||
throw new QueryCompileError("QUERY_TREE_ROOT", "A Query Tree requires one unaliased root selection");
|
||||
const plan: QueryTreePlan = { root: "root", nodes: [], projections: [], maxOccurrences: 0 };
|
||||
const collectionBound = (field: QuerySelection): number | undefined => {
|
||||
const limit = field.arguments.first ?? field.arguments.all;
|
||||
// Checked GraphQL Int literals retain their decimal spelling in the IR.
|
||||
if (limit?.kind !== "literal" || !["string", "number"].includes(typeof limit.value)) return;
|
||||
const value = Number(limit.value);
|
||||
return Number.isSafeInteger(value) && value > 0 ? Math.min(value, declaration.budgets.rows) : undefined;
|
||||
};
|
||||
const project = (id: string, subject: InterfaceRevisionId, fields: QuerySelection[], shape: ValueType) => {
|
||||
if (plan.projections.length >= 256)
|
||||
throw new QueryCompileError("QUERY_TREE_LIMIT", "Query Tree exceeds 256 projections");
|
||||
@@ -153,9 +160,15 @@ export function lowerQueryTree(
|
||||
for (const field of fields) {
|
||||
if (field.boundary || !containsBoundary(field.selection)) continue;
|
||||
const targets: { path: string[]; node: string }[] = [];
|
||||
const prune = (fields: QuerySelection[], shape: ValueType, path: string[], bound: number): QuerySelection[] => {
|
||||
if (shape.kind === "optional") return prune(fields, shape.value, path, bound);
|
||||
if (shape.kind === "list") return prune(fields, shape.value, [...path, "[]"], bound * declaration.budgets.rows);
|
||||
const prune = (
|
||||
fields: QuerySelection[],
|
||||
shape: ValueType,
|
||||
path: string[],
|
||||
bound: number,
|
||||
listLimit = declaration.budgets.rows,
|
||||
): QuerySelection[] => {
|
||||
if (shape.kind === "optional") return prune(fields, shape.value, path, bound, listLimit);
|
||||
if (shape.kind === "list") return prune(fields, shape.value, [...path, "[]"], bound * listLimit);
|
||||
const target = objectInterface(fields);
|
||||
if (target) {
|
||||
targets.push({
|
||||
@@ -168,7 +181,13 @@ export function lowerQueryTree(
|
||||
.filter((field) => containsBoundary(field.selection))
|
||||
.map((field) => ({
|
||||
...field,
|
||||
selection: prune(field.selection, fieldType(shape, field.key), [...path, field.key], bound),
|
||||
selection: prune(
|
||||
field.selection,
|
||||
fieldType(shape, field.key),
|
||||
[...path, field.key],
|
||||
bound,
|
||||
collectionBound(field) ?? listLimit,
|
||||
),
|
||||
}));
|
||||
// Relationship occurrence identity is its entry key, including duplicate
|
||||
// target Objects. Never substitute list position or Object identity.
|
||||
@@ -177,7 +196,10 @@ export function lowerQueryTree(
|
||||
return minimal;
|
||||
};
|
||||
const type = fieldType(shape, field.key);
|
||||
const minimal = { ...field, selection: prune(field.selection, type, [field.key], occurrences) };
|
||||
const minimal = {
|
||||
...field,
|
||||
selection: prune(field.selection, type, [field.key], occurrences, collectionBound(field)),
|
||||
};
|
||||
const selected = [...identity(fields), minimal];
|
||||
current.bindings.push({
|
||||
name: field.key,
|
||||
|
||||
@@ -364,6 +364,9 @@ export async function expandPresentationQueries(workspace: WorkspaceRevision): P
|
||||
for (const pkg of workspace.packageImports) {
|
||||
for (const original of [...(pkg.checkedQueries ?? [])]) {
|
||||
if (!original.declaration.id.startsWith("presentation:navigation:")) continue;
|
||||
// Identity must remain independent of every occurrence's data projection.
|
||||
// Full retained acquisition may include those requirements together.
|
||||
if (/:identity-(inputs|view)$/.test(original.declaration.id)) continue;
|
||||
const inputs = (stateInputs.get(original.declaration.root.interface) ?? []).map((input) => ({
|
||||
...input,
|
||||
query:
|
||||
|
||||
Reference in New Issue
Block a user