@bobbykim/manguito-cms-api 0.5.0 → 0.7.0

package/dist/index.js

@@ -38,14 +38,15 @@ function isColumnBacked(field) {
   if (col.junction) return false;
   return true;
 }
-function buildFieldKeyMap(pairs, allLabels, droppedKeys) {
+function buildFieldKeyMap(pairs, allLabels, droppedColumns, droppedLabels) {
   const labelToColumn = /* @__PURE__ */ new Map();
   const columnToLabel = /* @__PURE__ */ new Map();
   for (const { label, column } of pairs) {
     labelToColumn.set(label, column);
     columnToLabel.set(column, label);
   }
-  for (const label of allLabels) {
+  for (const { label, ownColumn } of allLabels) {
+    if (ownColumn !== void 0) continue;
     const columnOwner = columnToLabel.get(label);
     if (columnOwner !== void 0 && columnOwner !== label) {
       throw new Error(
@@ -54,23 +55,33 @@ function buildFieldKeyMap(pairs, allLabels, droppedKeys) {
     }
   }
   for (const label of labelToColumn.keys()) {
-    if (droppedKeys.has(label)) labelToColumn.delete(label);
+    if (droppedLabels.has(label)) labelToColumn.delete(label);
   }
   for (const column of columnToLabel.keys()) {
-    if (droppedKeys.has(column)) columnToLabel.delete(column);
+    if (droppedColumns.has(column)) columnToLabel.delete(column);
   }
   const diverges = [...labelToColumn].some(([label, column]) => label !== column);
-  function remap(input, lookup) {
+  function remap(input, lookup, dropped, droppedIfUnmapped) {
     const out = {};
     for (const key of Object.keys(input)) {
-      if (droppedKeys.has(key)) continue;
-      out[lookup.get(key) ?? key] = input[key];
+      const mapped = lookup.get(key);
+      if (mapped !== void 0) {
+        out[mapped] = input[key];
+        continue;
+      }
+      if (dropped.has(key) || droppedIfUnmapped?.has(key)) continue;
+      out[key] = input[key];
     }
     return out;
   }
   return {
-    toStorage: (input) => remap(input, labelToColumn),
-    toLabels: (row) => remap(row, columnToLabel),
+    // toStorage reads LABEL-keyed input: a live label maps and writes
+    // regardless of either drop set; an unmapped key is refused if it is
+    // EITHER the tombstone's own name (droppedLabels) or a raw, unexposed
+    // column (droppedColumns) — see remap's comment.
+    // toLabels reads COLUMN-keyed input, so it consults only droppedColumns.
+    toStorage: (input) => remap(input, labelToColumn, droppedLabels, droppedColumns),
+    toLabels: (row) => remap(row, columnToLabel, droppedColumns),
     columnFor: (label) => labelToColumn.get(label),
     labelFor: (column) => columnToLabel.get(column),
     labels: [...labelToColumn.keys()],
@@ -78,37 +89,52 @@ function buildFieldKeyMap(pairs, allLabels, droppedKeys) {
   };
 }
 function createFieldKeyMap(fields) {
-  const droppedKeys = /* @__PURE__ */ new Set();
+  const droppedColumns = /* @__PURE__ */ new Set();
+  const droppedLabels = /* @__PURE__ */ new Set();
   const pairs = [];
   for (const f of fields) {
     if (!isColumnBacked(f)) continue;
     pairs.push({ label: f.name, column: f.db_column.column_name });
     if (f.removed === true) {
-      droppedKeys.add(f.name);
-      droppedKeys.add(f.db_column.column_name);
+      droppedLabels.add(f.name);
+      droppedColumns.add(f.db_column.column_name);
     }
   }
   return buildFieldKeyMap(
     pairs,
-    fields.map((f) => f.name),
-    droppedKeys
+    fields.map((f) => ({
+      label: f.name,
+      // Conditional spread, not a plain assignment — exactOptionalPropertyTypes
+      // forbids present-and-undefined.
+      ...isColumnBacked(f) && { ownColumn: f.db_column.column_name }
+    })),
+    droppedColumns,
+    droppedLabels
   );
 }
 function createFieldKeyMapFromProjection(projectionType, allFields) {
   const pairs = projectionType.fields.map((f) => ({ label: f.exposed_as, column: f.column_name }));
-  const projected = new Set(pairs.map((p) => p.label));
-  const dropped = /* @__PURE__ */ new Set();
+  const projectedColumns = new Set(pairs.map((p) => p.column));
+  const projectedLabels = new Set(pairs.map((p) => p.label));
+  const droppedColumns = /* @__PURE__ */ new Set();
+  const droppedLabels = /* @__PURE__ */ new Set();
   for (const f of allFields) {
     if (!isColumnBacked(f)) continue;
-    dropped.add(f.name);
-    dropped.add(f.db_column.column_name);
+    if (!projectedColumns.has(f.db_column.column_name)) droppedColumns.add(f.db_column.column_name);
+    if (!projectedLabels.has(f.name)) droppedLabels.add(f.name);
   }
-  for (const p of pairs) dropped.delete(p.column);
-  for (const label of projected) dropped.delete(label);
   return buildFieldKeyMap(
     pairs,
-    allFields.map((f) => f.name),
-    dropped
+    allFields.map((f) => ({
+      label: f.name,
+      // See buildFieldKeyMap's collision check: `ownColumn` marks every
+      // column-backed field so the check skips it entirely — only a
+      // paragraph/junction/programmatic label (no column of its own) can
+      // still collide.
+      ...isColumnBacked(f) && { ownColumn: f.db_column.column_name }
+    })),
+    droppedColumns,
+    droppedLabels
   );
 }
 var init_field_keys = __esm({
@@ -287,9 +313,8 @@ function groupBy(items, key) {
   }
   return result;
 }
-function needsFkResolution(row, fkColumn, fieldName) {
-  if (fkColumn !== fieldName && !(fkColumn in row)) return false;
-  const current = row[fieldName];
+function needsFkResolution(row, fkColumn) {
+  const current = row[fkColumn];
   return !(typeof current === "object" && current !== null);
 }
 async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOnly = false) {
@@ -306,15 +331,11 @@ async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOn
       row[fieldName] = byParent[row["id"]] ?? [];
     }
   } else if (rel.type === "reference") {
-    const dropFk = rel.fk_column !== fieldName;
-    const pending = batch.filter((r) => needsFkResolution(r, rel.fk_column, fieldName));
+    const pending = batch.filter((r) => needsFkResolution(r, rel.fk_column));
     if (pending.length === 0) return;
     const fkValues = pending.map((r) => r[rel.fk_column]).filter(Boolean);
     if (fkValues.length === 0) {
-      for (const row of pending) {
-        row[fieldName] = null;
-        if (dropFk) delete row[rel.fk_column];
-      }
+      for (const row of pending) row[rel.fk_column] = null;
       return;
     }
     const unique = [...new Set(fkValues)];
@@ -331,8 +352,7 @@ async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOn
     }
     for (const row of pending) {
       const fkVal = row[rel.fk_column];
-      row[fieldName] = fkVal ? cache.get(`${rel.table}:${fkVal}`) ?? null : null;
-      if (dropFk) delete row[rel.fk_column];
+      row[rel.fk_column] = fkVal ? cache.get(`${rel.table}:${fkVal}`) ?? null : null;
     }
   } else if (rel.type === "junction") {
     const parentIds = batch.map((r) => r["id"]);
@@ -360,15 +380,11 @@ async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOn
       row[fieldName] = jEntries.map((jr) => cache.get(`${rel.table}:${jr[rel.right_column]}`)).filter(Boolean);
     }
   } else if (rel.type === "media") {
-    const dropFk = rel.fk_column !== fieldName;
-    const pending = batch.filter((r) => needsFkResolution(r, rel.fk_column, fieldName));
+    const pending = batch.filter((r) => needsFkResolution(r, rel.fk_column));
     if (pending.length === 0) return;
     const fkValues = pending.map((r) => r[rel.fk_column]).filter(Boolean);
     if (fkValues.length === 0) {
-      for (const row of pending) {
-        row[fieldName] = null;
-        if (dropFk) delete row[rel.fk_column];
-      }
+      for (const row of pending) row[rel.fk_column] = null;
       return;
     }
     const unique = [...new Set(fkValues)];
@@ -382,8 +398,7 @@ async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOn
     }
     for (const row of pending) {
       const fkVal = row[rel.fk_column];
-      row[fieldName] = fkVal ? cache.get(`media:${fkVal}`) ?? null : null;
-      if (dropFk) delete row[rel.fk_column];
+      row[rel.fk_column] = fkVal ? cache.get(`media:${fkVal}`) ?? null : null;
     }
   }
 }
@@ -537,10 +552,13 @@ var init_naming = __esm({
 });
 
 // src/graphql/filters.ts
-function buildSortFieldEnum(typeName) {
+function buildSortFieldEnum(typeName, fieldKeys) {
+  const resolvable = SORTABLE.filter(
+    (s) => s.gql === "createdAt" || s.gql === "updatedAt" || fieldKeys === void 0 || fieldKeys.columnFor(s.value) !== void 0
+  );
   return new import_graphql3.GraphQLEnumType({
     name: `${typeName}SortField`,
-    values: Object.fromEntries(SORTABLE.map((s) => [s.gql, { value: s.value }]))
+    values: Object.fromEntries(resolvable.map((s) => [s.gql, { value: s.value }]))
   });
 }
 function comparableFilterInput(name, scalar) {
@@ -575,18 +593,19 @@ function filterInputForField(fieldType) {
   if (scalar === null) return null;
   return StringFilter;
 }
-function buildFilterInputType(type) {
+function buildFilterInputType(type, viewFields) {
   const fields = {};
   fields["id"] = { type: IDFilter };
   fields["published"] = { type: BooleanFilter };
   fields["createdAt"] = { type: DateTimeFilter };
   fields["updatedAt"] = { type: DateTimeFilter };
   if (type.schema_type === "content-type") fields["slug"] = { type: StringFilter };
-  for (const f of type.fields) {
+  const entries = viewFields !== void 0 ? viewFields.map((v) => ({ field: v.field, exposedAs: v.exposedAs })) : type.fields.filter((f) => f.removed !== true).map((f) => ({ field: f, exposedAs: f.name }));
+  for (const { field: f, exposedAs } of entries) {
     if (f.field_type === "programmatic" || f.field_type === "paragraph") continue;
     if (f.field_type === "image" || f.field_type === "video" || f.field_type === "file") continue;
     const input = filterInputForField(f.field_type);
-    if (input) fields[buildFieldNameMap([f.name]).toGraphql(f.name)] = { type: input };
+    if (input) fields[buildFieldNameMap([exposedAs]).toGraphql(exposedAs)] = { type: input };
   }
   if (Object.keys(fields).length === 0) return null;
   return new import_graphql3.GraphQLInputObjectType({ name: `${graphqlTypeName(type.name)}Filter`, fields });
@@ -649,12 +668,14 @@ function codeError2(code, message) {
 function isPublished2(item) {
   return !!item && item["published"] === true;
 }
-function resolveFieldValue(field, row) {
+function resolveFieldValue(field, row, fallback) {
   const key = isColumnBacked(field) ? field.db_column.column_name : field.name;
-  return row[key] ?? null;
+  const value = row[key];
+  if ((value === null || value === void 0) && fallback !== void 0) return fallback;
+  return value ?? null;
 }
-function scalarFieldResolver(field) {
-  return (parent) => resolveFieldValue(field, parent);
+function scalarFieldResolver(field, fallback) {
+  return (parent) => resolveFieldValue(field, parent, fallback);
 }
 function relationFieldResolver(typeName, schemaFieldName) {
   return (parent, _args, ctx) => ctx.loaders.load(typeName, schemaFieldName, parent);
@@ -732,7 +753,7 @@ var init_resolvers = __esm({
 });
 
 // src/graphql/schema.ts
-function buildGraphQLSchema(registry, fieldKeyMaps = {}) {
+function buildGraphQLSchema(registry, fieldKeyMaps = {}, view, programmaticKeyMaps = fieldKeyMaps) {
   const objectTypes = /* @__PURE__ */ new Map();
   const enumTypes = /* @__PURE__ */ new Map();
   for (const [name, enumType] of Object.entries(registry.enum_types)) {
@@ -751,14 +772,14 @@ function buildGraphQLSchema(registry, fieldKeyMaps = {}) {
       );
     }
   }
-  function outputTypeForField(field) {
+  function outputTypeForField(field, required) {
     const scalar = scalarOutputType(field.field_type);
-    if (scalar) return field.required ? new import_graphql5.GraphQLNonNull(scalar) : scalar;
+    if (scalar) return required ? new import_graphql5.GraphQLNonNull(scalar) : scalar;
     if (field.field_type === "enum") {
       const ref = field.ui_component.component === "select" ? field.ui_component.enum_ref : void 0;
       const et = ref ? enumTypes.get(ref) : void 0;
       const t = et ?? import_graphql5.GraphQLString;
-      return field.required ? new import_graphql5.GraphQLNonNull(t) : t;
+      return required ? new import_graphql5.GraphQLNonNull(t) : t;
     }
     if (field.field_type === "image" || field.field_type === "video" || field.field_type === "file") {
       return MEDIA;
@@ -788,8 +809,17 @@ function buildGraphQLSchema(registry, fieldKeyMaps = {}) {
     }
     return import_graphql5.GraphQLString;
   }
+  function exposedFields(type) {
+    return type.fields.filter((f) => f.removed !== true);
+  }
+  function viewFieldsFor(machineName, type) {
+    return view?.[machineName]?.fields ?? exposedFields(type).map((f) => ({ field: f, exposedAs: f.name, required: f.required }));
+  }
   function buildObjectType(machineName, type) {
-    const mediaFieldNames = type.fields.filter((f) => f.field_type === "image" || f.field_type === "video" || f.field_type === "file").map((f) => f.name);
+    const visible = viewFieldsFor(machineName, type);
+    const mediaFieldNames = type.fields.filter(
+      (f) => f.removed !== true && (f.field_type === "image" || f.field_type === "video" || f.field_type === "file")
+    ).map((f) => f.name);
     return new import_graphql5.GraphQLObjectType({
       name: graphqlTypeName(machineName),
       fields: () => {
@@ -803,23 +833,25 @@ function buildGraphQLSchema(registry, fieldKeyMaps = {}) {
         }
         fields["createdAt"] = { type: new import_graphql5.GraphQLNonNull(DateTimeScalar), resolve: (p) => p["created_at"] };
         fields["updatedAt"] = { type: new import_graphql5.GraphQLNonNull(DateTimeScalar), resolve: (p) => p["updated_at"] };
-        for (const field of type.fields) {
-          const gqlName = toCamelCase(field.name);
-          const outType = outputTypeForField(field);
+        for (const vf of visible) {
+          const field = vf.field;
+          const gqlName = toCamelCase(vf.exposedAs);
+          const outType = outputTypeForField(field, vf.required);
           let resolve;
           if (field.field_type === "programmatic") {
-            resolve = programmaticFieldResolver(
-              machineName,
-              field.name,
-              mediaFieldNames,
-              fieldKeyMaps[machineName]
-            );
+            resolve = programmaticFieldResolver(machineName, field.name, mediaFieldNames, programmaticKeyMaps[machineName]);
           } else if (field.field_type === "reference" || field.field_type === "paragraph" || field.field_type === "image" || field.field_type === "video" || field.field_type === "file") {
             resolve = relationFieldResolver(machineName, field.name);
           } else {
-            resolve = scalarFieldResolver(field);
+            resolve = scalarFieldResolver(field, vf.fallback);
           }
-          fields[gqlName] = { type: outType, resolve };
+          fields[gqlName] = {
+            type: outType,
+            resolve,
+            // Conditional spread, not `deprecationReason: vf.deprecationReason`
+            // — exactOptionalPropertyTypes forbids present-and-undefined.
+            ...vf.deprecationReason !== void 0 && { deprecationReason: vf.deprecationReason }
+          };
         }
         return fields;
       }
@@ -851,7 +883,11 @@ function buildGraphQLSchema(registry, fieldKeyMaps = {}) {
   const queryFields = {};
   for (const [name, ct] of Object.entries(registry.content_types)) {
     const objType = objectTypes.get(name);
-    const nameMap = buildFieldNameMap(ct.fields.map((f) => f.name));
+    const visible = viewFieldsFor(name, ct);
+    const nameMap = buildFieldNameMap([
+      ...visible.map((v) => v.exposedAs),
+      ...ct.system_fields.map((s) => s.name)
+    ]);
     if (ct.only_one) {
       queryFields[singleQueryName(name)] = { type: objType, resolve: singletonResolver(name) };
       continue;
@@ -863,13 +899,13 @@ function buildGraphQLSchema(registry, fieldKeyMaps = {}) {
         meta: { type: new import_graphql5.GraphQLNonNull(PAGE_META), resolve: (r) => r.meta }
       }
     });
-    const filterType = buildFilterInputType(ct);
+    const filterType = buildFilterInputType(ct, visible);
     queryFields[collectionQueryName(name)] = {
       type: new import_graphql5.GraphQLNonNull(listType),
       args: {
         page: { type: import_graphql5.GraphQLInt },
         perPage: { type: import_graphql5.GraphQLInt },
-        sortBy: { type: buildSortFieldEnum(graphqlTypeName(name)) },
+        sortBy: { type: buildSortFieldEnum(graphqlTypeName(name), fieldKeyMaps[name]) },
         sortOrder: { type: SortOrderEnum },
         ...filterType ? { filter: { type: filterType } } : {}
       },
@@ -893,7 +929,11 @@ function buildGraphQLSchema(registry, fieldKeyMaps = {}) {
     queryFields[collectionQueryName(name)] = {
       type: new import_graphql5.GraphQLNonNull(listType),
       args: { page: { type: import_graphql5.GraphQLInt }, perPage: { type: import_graphql5.GraphQLInt } },
-      resolve: collectionResolver(name, buildFieldNameMap(tt.fields.map((f) => f.name)), fieldKeyMaps[name])
+      resolve: collectionResolver(
+        name,
+        buildFieldNameMap(viewFieldsFor(name, tt).map((v) => v.exposedAs)),
+        fieldKeyMaps[name]
+      )
     };
     queryFields[singleQueryName(name)] = {
       type: objType,
@@ -943,6 +983,76 @@ var init_schema = __esm({
   }
 });
 
+// src/graphql/version-view.ts
+function byColumn(fields) {
+  const out = /* @__PURE__ */ new Map();
+  for (const f of fields) {
+    if (!isColumnBacked(f)) continue;
+    out.set(f.db_column.column_name, f);
+  }
+  return out;
+}
+function deprecationFor(field, currentLabels, currentVersion) {
+  const currentLabel = currentLabels.get(field.column_name);
+  if (currentLabel === void 0) {
+    return `Removed in ${currentVersion}; column retained while this version is live.`;
+  }
+  if (currentLabel !== field.exposed_as) {
+    return `Renamed to '${currentLabel}' in ${currentVersion}.`;
+  }
+  return void 0;
+}
+function buildVersionView(input) {
+  const { registry, projection, currentProjection, currentVersion } = input;
+  const out = {};
+  const sources = [
+    registry.content_types,
+    registry.taxonomy_types,
+    registry.paragraph_types
+  ];
+  for (const source of sources) {
+    for (const [typeName, type] of Object.entries(source)) {
+      const projectionType = projection?.types[typeName];
+      if (projectionType === void 0) {
+        out[typeName] = {
+          fields: type.fields.filter((f) => f.removed !== true).map((f) => ({ field: f, exposedAs: f.name, required: f.required }))
+        };
+        continue;
+      }
+      const columns = byColumn(type.fields);
+      const currentLabels = /* @__PURE__ */ new Map();
+      for (const f of currentProjection?.types[typeName]?.fields ?? []) {
+        currentLabels.set(f.column_name, f.exposed_as);
+      }
+      const fields = [];
+      for (const pf of projectionType.fields) {
+        const field = columns.get(pf.column_name);
+        if (field === void 0) continue;
+        const reason = deprecationFor(pf, currentLabels, currentVersion);
+        fields.push({
+          field,
+          exposedAs: pf.exposed_as,
+          required: pf.required,
+          ...pf.fallback !== void 0 && { fallback: pf.fallback },
+          ...reason !== void 0 && { deprecationReason: reason }
+        });
+      }
+      for (const f of type.fields) {
+        if (isColumnBacked(f) || f.removed === true) continue;
+        fields.push({ field: f, exposedAs: f.name, required: f.required });
+      }
+      out[typeName] = { fields };
+    }
+  }
+  return out;
+}
+var init_version_view = __esm({
+  "src/graphql/version-view.ts"() {
+    "use strict";
+    init_field_keys();
+  }
+});
+
 // src/graphql/dataloaders.ts
 function createRelationLoaders(db, registry) {
   const relMaps = /* @__PURE__ */ new Map();
@@ -965,7 +1075,8 @@ function createRelationLoaders(db, registry) {
         async (parents) => {
           const rows = parents;
           await resolveRelationField(db, rows, fieldName, rel, cache, true);
-          return rows.map((r) => r[fieldName]);
+          const resultKey = rel.type === "reference" || rel.type === "media" ? rel.fk_column : fieldName;
+          return rows.map((r) => r[resultKey]);
         },
         // Batch within a tick; do not memoize by parent identity (rows are mutated
         // and may recur across nesting levels).
@@ -1035,15 +1146,29 @@ function isClientSafeGraphQLError(error) {
   }
   return false;
 }
-function createGraphQLHandler(registry, repos, fieldKeyMaps, resolver, db, options) {
-  const schema = buildGraphQLSchema(registry, fieldKeyMaps);
+function createGraphQLHandler(registry, repos, fieldKeyMaps, resolver, db, options, versioning = {}) {
+  let view;
+  if (versioning.projection !== void 0) {
+    if (versioning.currentVersion === void 0) {
+      throw new Error(
+        'createGraphQLHandler: currentVersion is required when a projection is supplied \u2014 deprecation reasons name it, and an empty one ships "Removed in ." into published SDL.'
+      );
+    }
+    view = buildVersionView({
+      registry,
+      projection: versioning.projection,
+      currentProjection: versioning.currentProjection,
+      currentVersion: versioning.currentVersion
+    });
+  }
+  const schema = buildGraphQLSchema(registry, fieldKeyMaps, view, versioning.currentFieldKeyMaps ?? fieldKeyMaps);
   const { plugins } = buildArmorPlugin({
     maxDepth: options.maxDepth,
     maxComplexity: options.maxComplexity
   });
   const yoga = (0, import_graphql_yoga.createYoga)({
     schema,
-    graphqlEndpoint: "/graphql",
+    graphqlEndpoint: versioning.endpoint ?? "/graphql",
     graphiql: options.graphiql,
     landingPage: false,
     maskedErrors: {
@@ -1071,6 +1196,7 @@ var init_handler = __esm({
     "use strict";
     import_graphql_yoga = require("graphql-yoga");
     init_schema();
+    init_version_view();
     init_dataloaders();
     init_security();
   }
@@ -1180,7 +1306,7 @@ function createSecurityHeadersMiddleware(options = {}) {
     c.res.headers.set("X-Content-Type-Options", "nosniff");
     c.res.headers.set("X-Frame-Options", "DENY");
     c.res.headers.set("Referrer-Policy", "no-referrer");
-    const isGraphiql = graphiqlPath !== void 0 && c.req.path === graphiqlPath;
+    const isGraphiql = graphiqlPath !== void 0 && (c.req.path === graphiqlPath || c.req.path.startsWith(`${graphiqlPath}/`));
     c.res.headers.set("Content-Security-Policy", isGraphiql ? graphiqlCsp : csp);
   };
 }
@@ -1691,18 +1817,21 @@ function createProgrammaticResolver(resolvers, options) {
 }
 
 // src/projector.ts
+init_field_keys();
 function isPlainRow(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v) && !(v instanceof Date);
 }
 var MEDIA_FIELD_TYPES = /* @__PURE__ */ new Set(["image", "video", "file"]);
-function nestedTargets(fields) {
+function nestedTargets(fields, map) {
   const out = [];
   for (const f of fields) {
     if (MEDIA_FIELD_TYPES.has(f.field_type)) continue;
     if (f.field_type !== "paragraph" && f.field_type !== "reference") continue;
     const ref = f.ui_component.ref;
     if (!ref) continue;
-    out.push({ label: f.name, target: ref });
+    const label = isColumnBacked(f) ? map.labelFor(f.db_column.column_name) : f.name;
+    if (label === void 0) continue;
+    out.push({ label, target: ref });
   }
   return out;
 }
@@ -1720,7 +1849,7 @@ function buildProjectors(registry, fieldKeyMaps, fallbacks) {
       const typeFallbacks = fallbacks?.[typeName];
       projectors[typeName] = {
         map,
-        nested: nestedTargets(type.fields),
+        nested: nestedTargets(type.fields, map),
         // Spread rather than assign: with exactOptionalPropertyTypes, an optional
         // property may be ABSENT but not present-and-undefined.
         ...typeFallbacks !== void 0 && { fallbacks: typeFallbacks }
@@ -1807,7 +1936,28 @@ function parseFilters(url, validFields, columnFor) {
 function isPublished(item) {
   return item["published"] === true;
 }
-function registerPublicContentRoutes(app, registry, repos, projectors, paths, listRateLimit, resolver) {
+function registerPublicContentRoutes(app, registry, repos, projectors, paths, listRateLimit, resolver, resolverProjectors) {
+  const forResolver = resolverProjectors ?? projectors;
+  function pickProgrammatic(resolved, names) {
+    const out = {};
+    for (const name of names) if (name in resolved) out[name] = resolved[name];
+    return out;
+  }
+  async function respondItem(row, typeName, programmatic) {
+    const data = projectRow(row, typeName, projectors);
+    if (!resolver?.hasSchema(typeName)) return data;
+    const resolved = await resolver.resolveItem(typeName, projectRow(row, typeName, forResolver));
+    return { ...data, ...pickProgrammatic(resolved, programmatic) };
+  }
+  async function respondList(rows, typeName, programmatic) {
+    const data = rows.map((row) => projectRow(row, typeName, projectors));
+    if (!resolver?.hasSchema(typeName)) return data;
+    const resolved = await resolver.resolveList(
+      typeName,
+      rows.map((row) => projectRow(row, typeName, forResolver))
+    );
+    return data.map((d, i) => ({ ...d, ...pickProgrammatic(resolved[i], programmatic) }));
+  }
   function registerListRoute(path, handler) {
     if (listRateLimit) {
       app.get(path, listRateLimit, handler);
@@ -1831,18 +1981,29 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
     return c.json({ ok: true, data });
   });
   for (const [typeName, contentType] of Object.entries(registry.content_types)) {
+    let translateInclude2 = function(requested) {
+      const include = [];
+      for (const field of requested) {
+        const registryName = includeNames.get(field);
+        if (registryName === void 0) return { ok: false, field };
+        include.push(registryName);
+      }
+      return { ok: true, include };
+    };
+    var translateInclude = translateInclude2;
     const basePath = contentType.default_base_path;
     const repo = repos[typeName];
     if (!repo) continue;
     const fieldKeys = projectors[typeName].map;
-    const relationFieldNames = /* @__PURE__ */ new Set();
+    const programmatic = contentType.fields.filter((f) => f.field_type === "programmatic").map((f) => f.name);
+    const includeNames = /* @__PURE__ */ new Map();
     for (const f of contentType.fields) {
       if (!RELATION_FIELD_TYPES.has(f.field_type)) continue;
       if (isColumnBacked(f)) {
         const label = fieldKeys.labelFor(f.db_column.column_name);
-        if (label !== void 0) relationFieldNames.add(label);
+        if (label !== void 0) includeNames.set(label, f.name);
       } else {
-        relationFieldNames.add(f.name);
+        includeNames.set(f.name, f.name);
       }
     }
     const filterableFieldNames = /* @__PURE__ */ new Set([
@@ -1861,8 +2022,11 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
             404
           );
         }
-        let data = projectRow(result.data[0], typeName, projectors);
-        if (resolver?.hasSchema(typeName)) data = await resolver.resolveItem(typeName, data);
+        const data = await respondItem(
+          result.data[0],
+          typeName,
+          programmatic
+        );
         return c.json({ ok: true, data });
       });
     } else {
@@ -1919,21 +2083,20 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
             400
           );
         }
-        const include = parseInclude(c.req.query("include"));
-        for (const field of include) {
-          if (!relationFieldNames.has(field)) {
-            return c.json(
-              {
-                ok: false,
-                error: {
-                  code: "INVALID_INCLUDE_FIELD",
-                  message: `'${field}' is not a valid relation field`
-                }
-              },
-              400
-            );
-          }
+        const translated = translateInclude2(parseInclude(c.req.query("include")));
+        if (!translated.ok) {
+          return c.json(
+            {
+              ok: false,
+              error: {
+                code: "INVALID_INCLUDE_FIELD",
+                message: `'${translated.field}' is not a valid relation field`
+              }
+            },
+            400
+          );
         }
+        const include = translated.include;
         const sortColumn = fieldKeys.labels.includes(sortBy) ? fieldKeys.columnFor(sortBy) : sortBy;
         const result = await repo.findMany({
           published_only: true,
@@ -1944,29 +2107,25 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
           filters: filtersResult.filters,
           include
         });
-        const labeled = result.data.map(
-          (row) => projectRow(row, typeName, projectors)
-        );
-        const data = resolver?.hasSchema(typeName) ? await resolver.resolveList(typeName, labeled) : labeled;
+        const data = await respondList(result.data, typeName, programmatic);
         return c.json({ ...result, data });
       });
       app.get(paths.item(basePath), async (c) => {
         const slug = c.req.param("slug");
-        const include = parseInclude(c.req.query("include"));
-        for (const field of include) {
-          if (!relationFieldNames.has(field)) {
-            return c.json(
-              {
-                ok: false,
-                error: {
-                  code: "INVALID_INCLUDE_FIELD",
-                  message: `'${field}' is not a valid relation field`
-                }
-              },
-              400
-            );
-          }
+        const translated = translateInclude2(parseInclude(c.req.query("include")));
+        if (!translated.ok) {
+          return c.json(
+            {
+              ok: false,
+              error: {
+                code: "INVALID_INCLUDE_FIELD",
+                message: `'${translated.field}' is not a valid relation field`
+              }
+            },
+            400
+          );
         }
+        const include = translated.include;
         const item = await repo.findBySlug(slug, include);
         if (!item || !isPublished(item)) {
           return c.json(
@@ -1977,15 +2136,15 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
             404
           );
         }
-        let data = projectRow(item, typeName, projectors);
-        if (resolver?.hasSchema(typeName)) data = await resolver.resolveItem(typeName, data);
+        const data = await respondItem(item, typeName, programmatic);
         return c.json({ ok: true, data });
       });
     }
   }
-  for (const [typeName] of Object.entries(registry.taxonomy_types)) {
+  for (const [typeName, taxonomyType] of Object.entries(registry.taxonomy_types)) {
     const repo = repos[typeName];
     if (!repo) continue;
+    const programmatic = taxonomyType.fields.filter((f) => f.field_type === "programmatic").map((f) => f.name);
     registerListRoute(paths.taxonomyCollection(typeName), async (c) => {
       const pagination = parsePagination(c.req.query("page"), c.req.query("per_page"));
       if (!pagination.ok) {
@@ -2005,10 +2164,7 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
         page: pagination.page,
         per_page: pagination.per_page
       });
-      const labeled = result.data.map(
-        (row) => projectRow(row, typeName, projectors)
-      );
-      const data = resolver?.hasSchema(typeName) ? await resolver.resolveList(typeName, labeled) : labeled;
+      const data = await respondList(result.data, typeName, programmatic);
       return c.json({ ...result, data });
     });
     app.get(paths.taxonomyItem(typeName), async (c) => {
@@ -2023,8 +2179,7 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
           404
         );
       }
-      let data = projectRow(item, typeName, projectors);
-      if (resolver?.hasSchema(typeName)) data = await resolver.resolveItem(typeName, data);
+      const data = await respondItem(item, typeName, programmatic);
       return c.json({ ok: true, data });
     });
   }
@@ -3816,7 +3971,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
 var import_drizzle_orm6 = require("drizzle-orm");
 var API_VERSION = (() => {
   try {
-    return "0.5.0";
+    return "0.7.0";
   } catch {
     return "0.0.0";
   }
@@ -4414,20 +4569,6 @@ function createCmsApp(options) {
       sortableColumns
     });
   };
-  const graphqlRepos = Object.fromEntries([
-    ...Object.entries(registry.content_types).map(([typeName, ct]) => [
-      typeName,
-      createDrizzleContentRepository(db, ct.db.table_name, {
-        sortableColumns: sortableColumnsFor(typeName)
-      })
-    ]),
-    ...Object.entries(registry.taxonomy_types).map(([typeName, tt]) => [
-      typeName,
-      createDrizzleContentRepository(db, tt.db.table_name, {
-        sortableColumns: sortableColumnsFor(typeName)
-      })
-    ])
-  ]);
   registerAuthRoutes(app, db);
   app.use("/admin/api/*", authMiddleware);
   app.use("/admin/api/*", mustChangePasswordCheck);
@@ -4494,7 +4635,7 @@ function createCmsApp(options) {
         app.use(path, attachDeprecationHeaders);
       }
     }
-    registerPublicContentRoutes(app, registry, surface.repos, surface.projectors, surface.paths, listRateLimit, programmaticResolver);
+    registerPublicContentRoutes(app, registry, surface.repos, surface.projectors, surface.paths, listRateLimit, programmaticResolver, projectors);
   }
   if (options.versions !== void 0) {
     app.all(`${prefix}/:version/*`, async (c, next) => {
@@ -4525,31 +4666,108 @@ function createCmsApp(options) {
   registerPublicMediaRoutes(app, mediaRepo, publicPaths, listRateLimit);
   if (options.graphql?.enabled) {
     const gqlOptions = options.graphql;
-    let gqlHandler = null;
-    let initError = null;
+    const makeGraphqlRepo = (_typeName, tableName, sortableColumns) => createDrizzleContentRepository(db, tableName, { sortableColumns });
+    const gqlPasses = [
+      ...options.versions !== void 0 ? model.live.map((v) => ({ version: v, projectionVersion: v })) : [],
+      { version: null, projectionVersion: model.current }
+    ];
+    const mounts = gqlPasses.map((pass) => ({
+      path: pass.version === null ? "/graphql" : `/graphql/${pass.version}`,
+      version: pass.version,
+      handler: null,
+      error: null
+    }));
     const ready = Promise.resolve().then(() => (init_handler(), handler_exports)).then(({ createGraphQLHandler: createGraphQLHandler2 }) => {
-      gqlHandler = createGraphQLHandler2(registry, graphqlRepos, fieldKeyMaps, programmaticResolver, db, gqlOptions);
+      gqlPasses.forEach((pass, i) => {
+        const mount = mounts[i];
+        try {
+          const surface = buildVersionSurface({
+            ...pass,
+            prefix,
+            registry,
+            model,
+            makeRepo: makeGraphqlRepo
+          });
+          const projection = model.projections[pass.projectionVersion];
+          const currentProjection = model.projections[model.current];
+          mount.handler = createGraphQLHandler2(
+            registry,
+            surface.repos,
+            surface.fieldKeyMaps,
+            programmaticResolver,
+            db,
+            gqlOptions,
+            {
+              endpoint: mount.path,
+              currentVersion: model.current,
+              ...projection !== void 0 && { projection },
+              ...currentProjection !== void 0 && { currentProjection },
+              currentFieldKeyMaps: fieldKeyMaps
+            }
+          );
+        } catch (err) {
+          mount.error = err;
+          const message = err instanceof Error ? err.message : String(err);
+          process.stderr.write(
+            `\u2717 GraphQL schema failed to initialize for ${mount.path}; it will return 500. ${message}
+`
+          );
+        }
+      });
     }).catch((err) => {
-      initError = err;
+      for (const m of mounts) m.error = err;
       const message = err instanceof Error ? err.message : String(err);
-      process.stderr.write(`\u2717 GraphQL schema failed to initialize; /graphql will return 500. ${message}
+      const paths = mounts.map((m) => m.path).join(", ");
+      process.stderr.write(`\u2717 GraphQL module failed to load; ${paths} will return 500. ${message}
 `);
     });
-    const invokeGraphQL = async (c) => {
-      if (!gqlHandler && !initError) await ready;
-      if (!gqlHandler) {
+    const invokeFor = (mount) => async (c) => {
+      if (!mount.handler && !mount.error) await ready;
+      if (!mount.handler) {
         return c.json(
           { ok: false, error: { code: "GRAPHQL_INIT_FAILED", message: "GraphQL schema failed to initialize" } },
           500
         );
       }
-      return gqlHandler(c, async () => {
+      return mount.handler(c, async () => {
       });
     };
-    if (listRateLimit) {
-      app.all("/graphql", listRateLimit, invokeGraphQL);
-    } else {
-      app.all("/graphql", invokeGraphQL);
+    for (const mount of mounts) {
+      const headers = deprecationHeaders({
+        requested: mount.version,
+        model,
+        successor: `/graphql/${model.current}`
+      });
+      if (headers === null) continue;
+      const attach = async (c, next) => {
+        await next();
+        for (const [key, value] of Object.entries(headers)) c.res.headers.set(key, value);
+      };
+      app.use(mount.path, attach);
+    }
+    for (const mount of mounts) {
+      if (listRateLimit) app.all(mount.path, listRateLimit, invokeFor(mount));
+      else app.all(mount.path, invokeFor(mount));
+    }
+    if (options.versions !== void 0) {
+      app.all("/graphql/:version", async (c, next) => {
+        const segment = c.req.param("version");
+        const kind = classifyVersion(segment, model);
+        if (kind === "not-a-version" || kind === "live") return next();
+        const live = model.live.join(", ");
+        return c.json({
+          errors: [
+            {
+              message: kind === "retired" ? `Version ${segment} is no longer served. Live versions: ${live}.` : `Version ${segment} does not exist. Live versions: ${live}.`,
+              extensions: {
+                code: kind === "retired" ? "VERSION_RETIRED" : "VERSION_UNKNOWN",
+                current: model.current,
+                live: model.live
+              }
+            }
+          ]
+        });
+      });
     }
   }
   registerConfigRoute(