lens-content-processor 0.33.0 → 0.35.0

package/dist/parser/response-segments.js

@@ -0,0 +1,499 @@
+// src/parser/response-segments.ts
+//
+// Response (subtyped question) segments: `#### Question: Open|Rating|Choice|
+// FillBlank|Ranking`. One segment family collects one learner response per
+// segment, with the same syntax in lenses, Learning Outcome tests, and
+// surveys. Context determines grading: surveys never grade. A bare
+// `#### Question` (no title) stays the legacy segment everywhere and never
+// reaches this module.
+import { isValidUuid } from "../validator/uuid.js";
+import { stripQuotes, validatePromptImportSyntax, } from "./lens.js";
+export const RESPONSE_QUESTION_SUBTYPES = [
+    "open",
+    "rating",
+    "choice",
+    "fillblank",
+    "ranking",
+];
+/** Author-facing capitalization, for error messages. */
+const SUBTYPE_DISPLAY = {
+    open: "Open",
+    rating: "Rating",
+    choice: "Choice",
+    fillblank: "FillBlank",
+    ranking: "Ranking",
+};
+const VALID_SUBTYPES_HINT = RESPONSE_QUESTION_SUBTYPES.map((s) => SUBTYPE_DISPLAY[s]).join(", ");
+const DEFAULT_RATING_SCALE = 5;
+const MIN_RATING_SCALE = 2;
+const MAX_RATING_SCALE = 10;
+/**
+ * Resolve a raw segment to its "question:<subtype>" schema key, for field
+ * validation against QUESTION_SUBTYPE_SCHEMAS. Returns null for anything
+ * that is not a titled question segment with a known subtype (legacy
+ * questions fall back to the plain "question" schema).
+ */
+export function responseSegmentSchemaKey(raw) {
+    if (raw.type !== "question" || !raw.title)
+        return null;
+    const subtype = raw.title.trim().toLowerCase();
+    return RESPONSE_QUESTION_SUBTYPES.includes(subtype)
+        ? `question:${subtype}`
+        : null;
+}
+function parseBool(raw, field) {
+    return raw.fields[field]?.toLowerCase() === "true" ? true : undefined;
+}
+/** Parse a positive-integer field; error and drop on anything else. */
+function parsePositiveInt(raw, field, file, errors) {
+    const value = raw.fields[field];
+    if (value === undefined)
+        return undefined;
+    const trimmed = value.trim();
+    if (!/^\d+$/.test(trimmed) || parseInt(trimmed, 10) === 0) {
+        errors.push({
+            file,
+            line: raw.line,
+            message: `Field '${field}' must be a positive integer, got '${value}'`,
+            suggestion: `Use a number like '${field}:: 500', or remove the field`,
+            severity: "error",
+        });
+        return undefined;
+    }
+    return parseInt(trimmed, 10);
+}
+/** Parse scale:: as an integer in [2, 10] (default 5). Null = hard error. */
+function parseScale(raw, file, errors) {
+    const value = raw.fields.scale;
+    if (value === undefined)
+        return DEFAULT_RATING_SCALE;
+    const trimmed = value.trim();
+    if (!/^\d+$/.test(trimmed)) {
+        errors.push({
+            file,
+            line: raw.line,
+            message: `Field 'scale' must be an integer, got '${value}'`,
+            suggestion: `Use a number from ${MIN_RATING_SCALE} to ${MAX_RATING_SCALE} (default ${DEFAULT_RATING_SCALE}), or omit the field`,
+            severity: "error",
+        });
+        return null;
+    }
+    const scale = parseInt(trimmed, 10);
+    if (scale < MIN_RATING_SCALE || scale > MAX_RATING_SCALE) {
+        errors.push({
+            file,
+            line: raw.line,
+            message: `Field 'scale' is ${scale}; ratings support ${MIN_RATING_SCALE}–${MAX_RATING_SCALE}`,
+            suggestion: `Use a value from ${MIN_RATING_SCALE} to ${MAX_RATING_SCALE}`,
+            severity: "error",
+        });
+        return null;
+    }
+    return scale;
+}
+/**
+ * Parse a multiline `- Item` list field shared by choice options:: and
+ * ranking items::. `allowCorrectMarks` (choice in lens/LO context) accepts
+ * `- [x] Item` and records its index; explicit-unchecked `- [ ]` is always
+ * an error, as is checkbox syntax where none is allowed.
+ */
+function parseListField(raw, field, allowCorrectMarks, file, errors) {
+    const value = raw.fields[field];
+    const capitalized = field === "options" ? "Choice" : "Ranking";
+    if (value === undefined || value.trim() === "") {
+        errors.push({
+            file,
+            line: raw.line,
+            message: `${capitalized} segment is missing ${field}::`,
+            suggestion: `Add a list:\n${field}::\n- First ${field === "options" ? "option" : "item"}\n- Second ${field === "options" ? "option" : "item"}`,
+            severity: "error",
+        });
+        return null;
+    }
+    const items = [];
+    const correct = [];
+    for (const line of value.split("\n")) {
+        const trimmed = line.trim();
+        if (!trimmed)
+            continue;
+        const uncheckedBox = trimmed.match(/^-\s*\[\s?\]\s*(.*)$/);
+        if (uncheckedBox) {
+            errors.push({
+                file,
+                line: raw.line,
+                message: `Explicit-unchecked checkbox syntax is not supported in ${field}::: "${trimmed}"`,
+                suggestion: allowCorrectMarks
+                    ? "Use plain '- Option text' items; mark correct options with '- [x] Option text'"
+                    : "Use plain '- Item text' items without brackets",
+                severity: "error",
+            });
+            return null;
+        }
+        const checkedBox = trimmed.match(/^-\s*\[[xX]\]\s*(.*)$/);
+        if (checkedBox) {
+            if (!allowCorrectMarks) {
+                errors.push({
+                    file,
+                    line: raw.line,
+                    message: field === "options"
+                        ? `Survey choices never have correct answers, got checkbox syntax: "${trimmed}"`
+                        : `Ranking items must be plain list items, got checkbox syntax: "${trimmed}"`,
+                    suggestion: field === "options"
+                        ? "Use plain '- Option text' items without brackets"
+                        : "Use plain '- Item text' items in the intended order — the intended order is the answer",
+                    severity: "error",
+                });
+                return null;
+            }
+            const text = checkedBox[1].trim();
+            if (!text) {
+                errors.push({
+                    file,
+                    line: raw.line,
+                    message: `Empty ${field}:: list item: "${trimmed}"`,
+                    suggestion: "Every list item needs text after the marker",
+                    severity: "error",
+                });
+                return null;
+            }
+            correct.push(items.length);
+            items.push(text);
+            continue;
+        }
+        const item = trimmed.match(/^-\s+(.+)$/);
+        if (!item) {
+            errors.push({
+                file,
+                line: raw.line,
+                message: `Line in ${field}:: is not a list item: "${trimmed}"`,
+                suggestion: `Every entry must be on its own '- ${field === "options" ? "Option" : "Item"} text' line`,
+                severity: "error",
+            });
+            return null;
+        }
+        items.push(item[1].trim());
+    }
+    if (items.length < 2) {
+        errors.push({
+            file,
+            line: raw.line,
+            message: `${capitalized} segment needs at least 2 ${field}, got ${items.length}`,
+            suggestion: `Add more '- …' lines under ${field}::`,
+            severity: "error",
+        });
+        return null;
+    }
+    return { items, correct };
+}
+/**
+ * A number reference for a graded `{{number <ref>}}` blank: optional minus,
+ * digits either plain or with comma thousands separators in exact 3-digit
+ * groups, optional decimal part.
+ */
+const REFERENCE_NUMBER = /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d+)?$/;
+/**
+ * Parse `{{…}}` blanks out of a fillblank content:: value:
+ * - `{{blank}}` — ungraded text blank
+ * - `{{number}}` — ungraded number blank
+ * - `{{number <ref>}}` — graded number blank (reference validated)
+ * - anything else — graded text blank, `|`-separated alternatives
+ */
+function parseFillBlanks(content, raw, file, errors) {
+    const blanks = [];
+    let failed = false;
+    const rewritten = content.replace(/\{\{(.*?)\}\}/gs, (match, inner) => {
+        const index = blanks.length;
+        const trimmed = String(inner).trim();
+        const keyword = trimmed.toLowerCase();
+        if (trimmed === "") {
+            errors.push({
+                file,
+                line: raw.line,
+                message: "Empty blank {{}} in fillblank content::",
+                suggestion: "Use {{blank}} for an ungraded blank, or {{expected answer}} for a graded one",
+                severity: "error",
+            });
+            failed = true;
+            return match;
+        }
+        if (keyword === "blank") {
+            blanks.push({ kind: "text", graded: false });
+            return `{{${index}}}`;
+        }
+        if (keyword === "number") {
+            blanks.push({ kind: "number", graded: false });
+            return `{{${index}}}`;
+        }
+        const numberRef = trimmed.match(/^number\s+(.+)$/i);
+        if (numberRef) {
+            const ref = numberRef[1].trim();
+            if (!REFERENCE_NUMBER.test(ref)) {
+                errors.push({
+                    file,
+                    line: raw.line,
+                    message: `Malformed reference number in blank {{${trimmed}}}: '${ref}'`,
+                    suggestion: "Use digits with optional comma thousands separators and decimal part, e.g. {{number 149,600,000}} or {{number 3.14}}",
+                    severity: "error",
+                });
+                failed = true;
+                return match;
+            }
+            blanks.push({ kind: "number", graded: true, referenceNumber: ref });
+            return `{{${index}}}`;
+        }
+        const alternatives = trimmed.split("|").map((alt) => alt.trim());
+        if (alternatives.some((alt) => alt === "")) {
+            errors.push({
+                file,
+                line: raw.line,
+                message: `Empty alternative in blank {{${trimmed}}}`,
+                suggestion: "Separate accepted answers with '|', each non-empty: {{Paris|paris}}",
+                severity: "error",
+            });
+            failed = true;
+            return match;
+        }
+        blanks.push({ kind: "text", graded: true, expected: alternatives });
+        return `{{${index}}}`;
+    });
+    if (failed)
+        return null;
+    if (blanks.length === 0) {
+        errors.push({
+            file,
+            line: raw.line,
+            message: "FillBlank segment has no {{…}} blanks in content::",
+            suggestion: "Add at least one blank, e.g. 'The capital of France is {{Paris}}.'",
+            severity: "error",
+        });
+        return null;
+    }
+    return { content: rewritten, blanks };
+}
+/**
+ * Parse a `#### Question: <Subtype>` segment. Shared by lens parsing
+ * (context "lens", also used for LO tests via convertSegment) and survey
+ * parsing (context "survey": never graded, `[x]` forbidden,
+ * assessment-instructions warned but passed through).
+ */
+export function parseResponseSegment(raw, context, file) {
+    const errors = [];
+    const subtypeRaw = (raw.title ?? "").trim();
+    const subtype = subtypeRaw.toLowerCase();
+    if (!RESPONSE_QUESTION_SUBTYPES.includes(subtype)) {
+        errors.push({
+            file,
+            line: raw.line,
+            message: `Unknown question subtype '${subtypeRaw}'`,
+            suggestion: `Valid subtypes: ${VALID_SUBTYPES_HINT} (e.g. '#### Question: Open'), or use plain '#### Question' for a legacy question`,
+            severity: "error",
+        });
+        return { segment: null, errors };
+    }
+    const questionType = subtype;
+    const display = `Question: ${SUBTYPE_DISPLAY[questionType]}`;
+    // id:: — plain UUID, quotes stripped like roleplay ids (a quoted id would
+    // reach the frontend verbatim and fail server-side UUID parsing).
+    const rawId = raw.fields.id?.trim();
+    const responseId = rawId ? stripQuotes(rawId).trim() : rawId;
+    if (!responseId) {
+        errors.push({
+            file,
+            line: raw.line,
+            message: `${display} segment missing id:: field`,
+            suggestion: "Add 'id:: <uuid>' — the id is the stable response key and must never change",
+            severity: "error",
+        });
+    }
+    else if (!isValidUuid(responseId)) {
+        errors.push({
+            file,
+            line: raw.line,
+            message: `${display} id:: is not a valid UUID: ${responseId}`,
+            suggestion: "Use a plain UUID, e.g. 'id:: 17a55209-deab-48c8-afb0-fc522722fe8f'",
+            severity: "error",
+        });
+        return { segment: null, errors };
+    }
+    const content = raw.fields.content;
+    if (!content || content.trim() === "") {
+        errors.push({
+            file,
+            line: raw.line,
+            message: `${display} segment missing content:: field`,
+            suggestion: "Add 'content:: Your question here'",
+            severity: "error",
+        });
+    }
+    if (!responseId || !content || content.trim() === "") {
+        return { segment: null, errors };
+    }
+    // assessment-instructions:: — grading rubric. Ratings are never graded;
+    // surveys never grade (warn, but pass the field through).
+    let assessmentInstructions = raw.fields["assessment-instructions"] || undefined;
+    if (assessmentInstructions && questionType === "rating") {
+        errors.push({
+            file,
+            line: raw.line,
+            message: "assessment-instructions:: on a Question: Rating segment — ratings are never graded",
+            suggestion: "Remove the assessment-instructions:: field",
+            severity: "error",
+        });
+        assessmentInstructions = undefined;
+    }
+    if (assessmentInstructions) {
+        errors.push(...validatePromptImportSyntax(assessmentInstructions, "assessment-instructions", file, raw.line));
+        if (context === "survey") {
+            errors.push({
+                file,
+                line: raw.line,
+                message: "assessment-instructions:: in a survey segment — surveys never grade, so this field will be ignored",
+                suggestion: "Remove the field, or move the segment into a lens",
+                severity: "warning",
+            });
+        }
+    }
+    const feedbackInstructions = raw.fields["feedback-instructions"] || undefined;
+    if (feedbackInstructions) {
+        errors.push(...validatePromptImportSyntax(feedbackInstructions, "feedback-instructions", file, raw.line));
+    }
+    const segment = {
+        type: "question",
+        questionType,
+        // Canonical lowercase: the backend matches segment ids against Postgres
+        // uuid strings (always lowercase), so the cache must never carry an
+        // uppercase-authored id.
+        responseId: responseId.toLowerCase(),
+        content,
+        graded: false, // derived per subtype below; always false in surveys
+        assessmentInstructions,
+        feedbackInstructions,
+        optional: parseBool(raw, "optional"),
+    };
+    switch (questionType) {
+        case "open": {
+            segment.maxChars = parsePositiveInt(raw, "max-chars", file, errors);
+            segment.maxTime = raw.fields["max-time"] || undefined;
+            const placeholder = raw.fields.placeholder?.trim();
+            if (placeholder)
+                segment.placeholder = placeholder;
+            segment.enforceVoice = parseBool(raw, "enforce-voice");
+            segment.graded = Boolean(assessmentInstructions);
+            break;
+        }
+        case "rating": {
+            const scale = parseScale(raw, file, errors);
+            if (scale === null)
+                return { segment: null, errors };
+            segment.scale = scale;
+            const lowLabel = raw.fields["low-label"]?.trim();
+            const highLabel = raw.fields["high-label"]?.trim();
+            if (lowLabel)
+                segment.lowLabel = lowLabel;
+            if (highLabel)
+                segment.highLabel = highLabel;
+            segment.graded = false;
+            break;
+        }
+        case "choice": {
+            const parsed = parseListField(raw, "options", context === "lens", file, errors);
+            if (parsed === null)
+                return { segment: null, errors };
+            segment.multi = parseBool(raw, "multi");
+            if (parsed.correct.length > 1 && !segment.multi) {
+                // A single-choice submission carries exactly one selection, so a
+                // multi-option correct set could never be matched — every learner
+                // would score 0.
+                errors.push({
+                    file,
+                    line: raw.line,
+                    message: `Choice has ${parsed.correct.length} correct options but is single-choice — add 'multi:: true' or mark exactly one option`,
+                    suggestion: "Add 'multi:: true' to allow multiple selections, or keep exactly one '- [x]' option",
+                    severity: "error",
+                });
+                return { segment: null, errors };
+            }
+            segment.options = parsed.items;
+            if (parsed.correct.length > 0)
+                segment.correctOptions = parsed.correct;
+            segment.shuffle = parseBool(raw, "shuffle");
+            segment.graded = parsed.correct.length > 0;
+            break;
+        }
+        case "fillblank": {
+            const parsed = parseFillBlanks(content, raw, file, errors);
+            if (parsed === null)
+                return { segment: null, errors };
+            segment.content = parsed.content;
+            segment.blanks = parsed.blanks;
+            segment.graded =
+                parsed.blanks.some((b) => b.graded) || Boolean(assessmentInstructions);
+            break;
+        }
+        case "ranking": {
+            const parsed = parseListField(raw, "items", false, file, errors);
+            if (parsed === null)
+                return { segment: null, errors };
+            segment.items = parsed.items;
+            segment.graded = Boolean(assessmentInstructions);
+            break;
+        }
+    }
+    if (context === "survey")
+        segment.graded = false;
+    return { segment, errors };
+}
+/**
+ * Map a parsed response segment to its flattened QuestionSegment shape.
+ * Used directly by survey parsing (surveys have no flatten pass) and by the
+ * lens flattener, which then replaces assessmentInstructions /
+ * feedbackInstructions with their prompt-import-expanded values.
+ */
+export function toFlattenedResponseSegment(parsed) {
+    const segment = {
+        type: "question",
+        questionType: parsed.questionType,
+        responseId: parsed.responseId,
+        content: parsed.content,
+        graded: parsed.graded,
+    };
+    if (parsed.assessmentInstructions)
+        segment.assessmentInstructions = parsed.assessmentInstructions;
+    if (parsed.feedbackInstructions)
+        segment.feedbackInstructions = parsed.feedbackInstructions;
+    if (parsed.optional)
+        segment.optional = true;
+    // open:
+    if (parsed.maxTime)
+        segment.maxTime = parsed.maxTime;
+    if (parsed.maxChars !== undefined)
+        segment.maxChars = parsed.maxChars;
+    if (parsed.enforceVoice)
+        segment.enforceVoice = true;
+    if (parsed.placeholder)
+        segment.placeholder = parsed.placeholder;
+    // rating:
+    if (parsed.scale !== undefined)
+        segment.scale = parsed.scale;
+    if (parsed.lowLabel)
+        segment.lowLabel = parsed.lowLabel;
+    if (parsed.highLabel)
+        segment.highLabel = parsed.highLabel;
+    // choice:
+    if (parsed.options)
+        segment.options = parsed.options;
+    if (parsed.correctOptions)
+        segment.correctOptions = parsed.correctOptions;
+    if (parsed.multi)
+        segment.multi = true;
+    if (parsed.shuffle)
+        segment.shuffle = true;
+    // fillblank:
+    if (parsed.blanks)
+        segment.blanks = parsed.blanks;
+    // ranking:
+    if (parsed.items)
+        segment.items = parsed.items;
+    return segment;
+}
+//# sourceMappingURL=response-segments.js.map

package/dist/parser/response-segments.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"response-segments.js","sourceRoot":"","sources":["../../src/parser/response-segments.ts"],"names":[],"mappings":"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"}

package/dist/parser/survey.js

@@ -9,16 +9,21 @@
 // breaking response continuity (and the platform can special-case keys like
 // `buddy_texted`).
 //
-// Surveys deliberately do NOT reuse the lens question machinery: there are no
-// correct answers, no AI assessment, and no reveal semantics. Keeping the
-// vocabulary separate also avoids colliding with the quiz `question-type::`
-// syntax if that ever lands on lens questions.
+// Legacy survey segments deliberately do NOT reuse the lens question
+// machinery: there are no correct answers, no AI assessment, and no reveal
+// semantics. New-style response segments (`#### Question: <Subtype>` with a
+// stable id:: instead of key::) DO share the lens parser
+// (parser/response-segments.ts), but in survey context: never graded, and
+// correct-answer marks are forbidden.
 import { parseFrontmatter } from "./frontmatter.js";
 import { parseSections } from "./sections.js";
 import { validateFrontmatter } from "../validator/validate-frontmatter.js";
 import { detectFieldTypos } from "../validator/field-typos.js";
+import { validateSegmentFields } from "../validator/segment-fields.js";
+import { validateFieldValues } from "../validator/field-values.js";
 import { stripAuthoringMarkup, stripAuthoringMarkupForValidation, usePublishedStrings, } from "../authoring-markup.js";
 import { SURVEY_SEGMENT_SCHEMAS } from "../content-schema.js";
+import { parseResponseSegment, responseSegmentSchemaKey, toFlattenedResponseSegment, } from "./response-segments.js";
 // Valid segment types for survey H4 headers
 export const SURVEY_SEGMENT_TYPES = new Set([
     "text",
@@ -233,6 +238,18 @@ function validateSurveySegmentFields(raw, file) {
 }
 function convertSurveySegment(raw, file) {
     const errors = [];
+    // `#### Question: <Subtype>` — new-style response segment, shared with
+    // lens parsing but in survey context: keyed by id:: (no key::), never
+    // graded, correct-answer marks forbidden. Legacy survey segments
+    // (untitled Question, and Rating/Choice) are untouched below.
+    if (raw.type === "question" && raw.title) {
+        const { segment, errors: responseErrors } = parseResponseSegment(raw, "survey", file);
+        errors.push(...responseErrors);
+        return {
+            segment: segment ? toFlattenedResponseSegment(segment) : null,
+            errors,
+        };
+    }
     if (raw.title) {
         const capitalized = raw.type[0].toUpperCase() + raw.type.slice(1);
         errors.push({
@@ -348,30 +365,50 @@ function parseSurveyPrepared(content, file) {
     }
     const title = typeof frontmatter.title === "string" ? frontmatter.title : undefined;
     // Flat H4 segments, same shape as lens bodies
-    const { sections: rawSegments, errors: segmentErrors } = parseSections(body, 3, SURVEY_SEGMENT_TYPES, file, true, bodyStartLine - 1);
+    const { sections: rawSegments, errors: segmentErrors } = parseSections(body, 3, SURVEY_SEGMENT_TYPES, file, true);
+    for (const error of segmentErrors) {
+        if (error.line)
+            error.line += bodyStartLine - 1;
+    }
     errors.push(...segmentErrors);
     const segments = [];
     const seenKeys = new Map(); // key -> first line
     for (const rawSeg of rawSegments) {
-        errors.push(...validateSurveySegmentFields(rawSeg, file));
+        rawSeg.line += bodyStartLine - 1;
+        // New-style response segments validate against their
+        // "question:<subtype>" schema; everything else against the survey
+        // vocabulary.
+        const responseSchemaKey = responseSegmentSchemaKey(rawSeg);
+        if (responseSchemaKey) {
+            errors.push(...validateSegmentFields(responseSchemaKey, rawSeg.fields, file, rawSeg.line));
+            errors.push(...validateFieldValues(rawSeg.fields, file, rawSeg.line));
+        }
+        else {
+            errors.push(...validateSurveySegmentFields(rawSeg, file));
+        }
         errors.push(...detectFieldTypos(rawSeg.fields, file, rawSeg.line));
         const { segment, errors: conversionErrors } = convertSurveySegment(rawSeg, file);
         errors.push(...conversionErrors);
         if (!segment)
             continue;
         if (segment.type !== "text") {
-            const firstLine = seenKeys.get(segment.key);
+            // Answerable segments need a unique identifier: legacy segments their
+            // key::, new-style response segments their id:: (responseId).
+            const isLegacy = "key" in segment;
+            const dedupKey = isLegacy ? segment.key : segment.responseId;
+            const label = isLegacy ? "key" : "id";
+            const firstLine = seenKeys.get(dedupKey);
             if (firstLine !== undefined) {
                 errors.push({
                     file,
                     line: rawSeg.line,
-                    message: `Duplicate key '${segment.key}' (already used at line ${firstLine})`,
-                    suggestion: "Every answerable segment needs a unique key",
+                    message: `Duplicate ${label} '${dedupKey}' (already used at line ${firstLine})`,
+                    suggestion: `Every answerable segment needs a unique ${label}`,
                     severity: "error",
                 });
                 continue;
             }
-            seenKeys.set(segment.key, rawSeg.line);
+            seenKeys.set(dedupKey, rawSeg.line);
         }
         segments.push(segment);
     }
@@ -395,14 +432,18 @@ function parseSurveyPrepared(content, file) {
 export function parseSurvey(content, file) {
     const validationSource = stripAuthoringMarkupForValidation(content);
     const result = parseSurveyPrepared(validationSource, file);
-    if (!result.survey)
-        return result;
     const publishedSource = stripAuthoringMarkup(content);
     if (publishedSource === validationSource)
         return result;
     const published = parseSurveyPrepared(publishedSource, file);
-    if (published.survey)
-        usePublishedStrings(result.survey, published.survey);
-    return result;
+    // See parseLens: graft only when both parses have the same shape; otherwise
+    // (or when only the publishing parse succeeds) it stands on its own.
+    if (!published.survey)
+        return result;
+    if (!result.survey)
+        return published;
+    return usePublishedStrings(result.survey, published.survey)
+        ? result
+        : published;
 }
 //# sourceMappingURL=survey.js.map