@esheet/adapters 0.0.4-1 → 0.0.4-2

package/dist/fhir/fhir-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fhir-adapter.d.ts","sourceRoot":"","sources":["../../src/fhir/fhir-adapter.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,cAAc,EAOf,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EACV,iBAAiB,EAEjB,yBAAyB,EAMzB,iBAAiB,EACjB,iBAAiB,EACjB,qBAAqB,EACrB,qBAAqB,EAKtB,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,mBAAmB,EACnB,2BAA2B,EAc5B,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,CAAC;AAM5D;;GAEG;AACH,wBAAgB,cAAc,CAC5B,aAAa,EAAE,iBAAiB,EAChC,OAAO,CAAC,EAAE,iBAAiB,GAC1B,cAAc,CA0BhB;AAiSD;;GAEG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,cAAc,EACpB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,iBAAiB,CAmCnB;AAsID;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,yBAAyB,EACnC,OAAO,CAAC,EAAE,qBAAqB,GAC9B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAQzB;AAuDD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,cAAc,EACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,OAAO,EAAE,qBAAqB,GAC7B,yBAAyB,CAa3B"}
+{"version":3,"file":"fhir-adapter.d.ts","sourceRoot":"","sources":["../../src/fhir/fhir-adapter.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,cAAc,EASf,MAAM,cAAc,CAAC;AAItB,OAAO,KAAK,EACV,iBAAiB,EAEjB,yBAAyB,EAMzB,iBAAiB,EACjB,iBAAiB,EACjB,qBAAqB,EACrB,qBAAqB,EAMtB,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,mBAAmB,EACnB,2BAA2B,EAc5B,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,CAAC;AAM5D;;GAEG;AACH,wBAAgB,cAAc,CAC5B,aAAa,EAAE,iBAAiB,EAChC,OAAO,CAAC,EAAE,iBAAiB,GAC1B,cAAc,CA0BhB;AAyXD;;GAEG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,cAAc,EACpB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,iBAAiB,CAmCnB;AAsJD;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,yBAAyB,EACnC,OAAO,CAAC,EAAE,qBAAqB,GAC9B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAQzB;AA6DD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,cAAc,EACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,OAAO,EAAE,qBAAqB,GAC7B,yBAAyB,CAa3B"}

package/dist/fhir/fhir-adapter.js

@@ -1,6 +1,7 @@
 // ---------------------------------------------------------------------------
 // FHIR R4 Adapter - Bidirectional conversion
 // ---------------------------------------------------------------------------
+import { normalizeExpression } from '@esheet/core';
 import { isFhirQuestionnaire, isFhirQuestionnaireResponse, mapFhirTypeToEsheet, mapEsheetTypeToFhir, convertAnswerOptionToFieldOption, convertOptionToFhirAnswerOption, mapFhirOperatorToEsheet, mapEsheetOperatorToFhir, mapEnableBehaviorToLogic, extractEnableWhenAnswer, getExtensionValue, createItemControlExtension, createSignatureRequiredExtension, generateUUID, FHIR_EXT, } from './utils.js';
 // Re-export type guards
 export { isFhirQuestionnaire, isFhirQuestionnaireResponse };
@@ -66,18 +67,35 @@ function convertItemToField(item, path, warnings, options) {
         question: item.text,
         required: item.required,
     };
+    // Extract eSheet layout extensions — first-class field properties, not metadata
+    const width = getExtensionValue(item.extension, FHIR_EXT.FIELD_WIDTH);
+    const optionLayout = getExtensionValue(item.extension, FHIR_EXT.OPTION_LAYOUT);
+    const widthSpread = width ? { width } : {};
+    const optionLayoutSpread = optionLayout ? { optionLayout } : {};
     // Build _sourceData for round-trip
     const fieldMeta = buildFieldMeta(item, typeResult, options);
     const hasFieldMeta = Object.keys(fieldMeta).length > 0;
     // Convert enableWhen to rules
     const rules = convertEnableWhenToRules(item.enableWhen, item.enableBehavior);
+    // Convert calculatedExpression / initialExpression to a setValue rule.
+    const exprMeta = fieldMeta.calculatedExpression ?? fieldMeta.initialExpression;
+    if (exprMeta?.expression) {
+        const expression = exprMeta.language === 'text/fhirpath'
+            ? normalizeExpression(exprMeta.expression)
+            : exprMeta.expression;
+        rules.push({
+            effect: 'setValue',
+            logic: 'AND',
+            conditions: [{ conditionType: 'expression', expression }],
+        });
+    }
     const rulesSpread = rules.length > 0 ? { rules } : {};
     // Handle warnings for lossy conversions
     addConversionWarnings(item, path, typeResult, warnings);
     // Build field based on type
     switch (typeResult.fieldType) {
         case 'section':
-            return buildSectionField(base, item, path, warnings, options, hasFieldMeta ? fieldMeta : undefined);
+            return buildSectionField(base, item, path, warnings, options, hasFieldMeta ? fieldMeta : undefined, widthSpread);
         case 'radio':
         case 'check':
         case 'dropdown':
@@ -86,15 +104,29 @@ function convertItemToField(item, path, warnings, options) {
                 ...base,
                 ...(hasFieldMeta ? { _sourceData: fieldMeta } : {}),
                 ...rulesSpread,
+                ...widthSpread,
+                ...optionLayoutSpread,
                 fieldType: typeResult.fieldType,
                 options: convertAnswerOptions(item.answerOption, existingIds),
             };
+        case 'openchoice':
+            return {
+                ...base,
+                ...(hasFieldMeta ? { _sourceData: fieldMeta } : {}),
+                ...rulesSpread,
+                ...widthSpread,
+                ...optionLayoutSpread,
+                fieldType: 'openchoice',
+                options: convertAnswerOptions(item.answerOption, existingIds),
+            };
         case 'rating':
         case 'slider':
             return {
                 ...base,
                 ...(hasFieldMeta ? { _sourceData: fieldMeta } : {}),
                 ...rulesSpread,
+                ...widthSpread,
+                ...optionLayoutSpread,
                 fieldType: typeResult.fieldType,
                 options: convertAnswerOptions(item.answerOption, existingIds),
             };
@@ -104,6 +136,7 @@ function convertItemToField(item, path, warnings, options) {
                 ...base,
                 ...(hasFieldMeta ? { _sourceData: fieldMeta } : {}),
                 ...rulesSpread,
+                ...widthSpread,
                 fieldType: typeResult.fieldType,
                 ...(typeResult.inputType ? { inputType: typeResult.inputType } : {}),
             };
@@ -119,10 +152,12 @@ function convertItemToField(item, path, warnings, options) {
         case 'boolean':
         case 'signature':
         case 'diagram':
+        case 'file':
             return {
                 ...base,
                 ...(hasFieldMeta ? { _sourceData: fieldMeta } : {}),
                 ...rulesSpread,
+                ...widthSpread,
                 fieldType: typeResult.fieldType,
             };
         default:
@@ -130,17 +165,19 @@ function convertItemToField(item, path, warnings, options) {
                 ...base,
                 ...(hasFieldMeta ? { _sourceData: fieldMeta } : {}),
                 ...rulesSpread,
+                ...widthSpread,
                 fieldType: 'text',
             };
     }
 }
-function buildSectionField(base, item, path, warnings, options, fieldMeta) {
+function buildSectionField(base, item, path, warnings, options, fieldMeta, widthSpread) {
     const nestedFields = item.item
         ? item.item.map((child, i) => convertItemToField(child, `${path}.item[${i}]`, warnings, options))
         : [];
     return {
         ...base,
         ...(fieldMeta ? { _sourceData: fieldMeta } : {}),
+        ...widthSpread,
         fieldType: 'section',
         title: item.text,
         fields: nestedFields,
@@ -159,6 +196,15 @@ function buildFieldMeta(item, typeResult, options) {
         meta.readOnly = item.readOnly;
     if (item.repeats)
         meta.repeats = item.repeats;
+    // Extract SDC expression extensions for round-trip and setValue conversion
+    const calcExpr = getExtensionValue(item.extension, FHIR_EXT.CALCULATED_EXPRESSION);
+    if (calcExpr)
+        meta.calculatedExpression =
+            calcExpr;
+    const initExpr = getExtensionValue(item.extension, FHIR_EXT.INITIAL_EXPRESSION);
+    if (initExpr)
+        meta.initialExpression =
+            initExpr;
     // Store original FHIR type for export
     meta.fhirItemType = item.type;
     // Extract validation extensions
@@ -232,6 +278,19 @@ function addConversionWarnings(item, path, typeResult, warnings) {
             message: `FHIR quantity type converted to number field. Unit choices lost.`,
         });
     }
+    // Expression warning — calculatedExpression / initialExpression are imported
+    // as setValue rules but the expression string (CQL/FHIRPath) must be manually
+    // adapted to eSheet {fieldId} syntax before it will evaluate correctly.
+    const hasCalcExpr = !!getExtensionValue(item.extension, FHIR_EXT.CALCULATED_EXPRESSION);
+    const hasInitExpr = !!getExtensionValue(item.extension, FHIR_EXT.INITIAL_EXPRESSION);
+    if (hasCalcExpr || hasInitExpr) {
+        warnings.push({
+            path,
+            code: 'UNSUPPORTED_TYPE',
+            severity: 'info',
+            message: `${hasCalcExpr ? 'calculatedExpression' : 'initialExpression'} imported as a setValue rule. Expression syntax must be adapted to eSheet {fieldId} notation.`,
+        });
+    }
     // ValueSet reference (informational)
     if (item.answerValueSet) {
         warnings.push({
@@ -305,10 +364,26 @@ function convertFieldToItem(field) {
     if (field.fieldType === 'signature') {
         extensions.push(createSignatureRequiredExtension());
     }
-    // Add preserved extensions
+    // Add eSheet layout extensions
+    const fieldDef = field;
+    if (fieldDef.width && fieldDef.width !== 'full') {
+        extensions.push({ url: FHIR_EXT.FIELD_WIDTH, valueCode: fieldDef.width });
+    }
+    if (fieldDef.optionLayout && fieldDef.optionLayout !== 'stack') {
+        extensions.push({
+            url: FHIR_EXT.OPTION_LAYOUT,
+            valueCode: fieldDef.optionLayout,
+        });
+    }
+    // Add preserved extensions (exclude any we regenerate to avoid duplicates)
     if (fieldMeta?.fhirExtensions) {
-        // Filter out extensions we're generating ourselves
-        const preserved = fieldMeta.fhirExtensions.filter((e) => e.url !== FHIR_EXT.ITEM_CONTROL && e.url !== FHIR_EXT.SIGNATURE_REQUIRED);
+        const generated = new Set([
+            FHIR_EXT.ITEM_CONTROL,
+            FHIR_EXT.SIGNATURE_REQUIRED,
+            FHIR_EXT.FIELD_WIDTH,
+            FHIR_EXT.OPTION_LAYOUT,
+        ]);
+        const preserved = fieldMeta.fhirExtensions.filter((e) => !generated.has(e.url));
         extensions.push(...preserved);
     }
     if (extensions.length > 0) {
@@ -445,7 +520,12 @@ function extractSingleAnswerValue(answer) {
     if (answer.valueQuantity)
         return answer.valueQuantity.value;
     if (answer.valueAttachment)
-        return answer.valueAttachment.data;
+        return {
+            data: answer.valueAttachment.data,
+            contentType: answer.valueAttachment.contentType,
+            title: answer.valueAttachment.title,
+            url: answer.valueAttachment.url,
+        };
     if (answer.valueReference)
         return answer.valueReference.reference;
     return undefined;
@@ -532,6 +612,41 @@ function convertValueToAnswers(field, value) {
                     },
                 },
             ];
+        case 'file': {
+            // value may be a string (base64) or an object with data/dataUrl/contentType/title
+            if (typeof value === 'string') {
+                return [
+                    {
+                        valueAttachment: {
+                            contentType: 'application/octet-stream',
+                            data: value,
+                        },
+                    },
+                ];
+            }
+            const v = value;
+            let dataBase64 = undefined;
+            let contentType = v.contentType ?? 'application/octet-stream';
+            if (v.data)
+                dataBase64 = v.data;
+            else if (v.dataUrl) {
+                const comma = v.dataUrl.indexOf(',');
+                dataBase64 = comma >= 0 ? v.dataUrl.slice(comma + 1) : v.dataUrl;
+                const prefix = v.dataUrl.slice(0, comma);
+                const m = prefix.match(/data:([^;]+)/);
+                if (m && m[1])
+                    contentType = m[1];
+            }
+            return [
+                {
+                    valueAttachment: {
+                        contentType,
+                        data: dataBase64,
+                        title: v.title,
+                    },
+                },
+            ];
+        }
         default:
             return [{ valueString: String(value) }];
     }
@@ -552,13 +667,22 @@ function convertTextAnswer(value, inputType) {
             return { valueString: String(value) };
     }
 }
-function createCodingAnswer(field, selectedId) {
+function createCodingAnswer(field, selectedIdOrObj) {
     const options = 'options' in field ? field.options : undefined;
+    const selectedId = typeof selectedIdOrObj === 'string'
+        ? selectedIdOrObj
+        : selectedIdOrObj.id ?? String(selectedIdOrObj.value ?? '');
     const option = options?.find((o) => o.id === selectedId);
     return {
         valueCoding: {
-            code: option?.value ?? selectedId,
-            display: option?.text,
+            code: option?.value ??
+                (typeof selectedIdOrObj === 'string'
+                    ? selectedIdOrObj
+                    : selectedIdOrObj.value ?? selectedId),
+            display: option?.text ??
+                (typeof selectedIdOrObj === 'object'
+                    ? selectedIdOrObj.value
+                    : undefined),
         },
     };
 }

package/dist/fhir/utils.d.ts

@@ -15,6 +15,10 @@ export declare const FHIR_EXT: {
     readonly CALCULATED_EXPRESSION: "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-calculatedExpression";
     readonly ENABLE_WHEN_EXPRESSION: "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression";
     readonly VARIABLE: "http://hl7.org/fhir/StructureDefinition/variable";
+    /** valueCode: 'full' | 'half' | 'third' */
+    readonly FIELD_WIDTH: "https://esheet.os.mieweb.org/docs/adapters/fhir/extensions#field-width";
+    /** valueCode: 'stack' | 'wrap' */
+    readonly OPTION_LAYOUT: "https://esheet.os.mieweb.org/docs/adapters/fhir/extensions#option-layout";
 };
 export declare const ITEM_CONTROL_SYSTEM = "http://hl7.org/fhir/questionnaire-item-control";
 /**

package/dist/fhir/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fhir/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fhir/utils.ts"],"names":[],"mappings":"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"}

package/dist/fhir/utils.js

@@ -27,6 +27,12 @@ export const FHIR_EXT = {
     CALCULATED_EXPRESSION: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-calculatedExpression',
     ENABLE_WHEN_EXPRESSION: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-enableWhenExpression',
     VARIABLE: 'http://hl7.org/fhir/StructureDefinition/variable',
+    // eSheet layout extensions (custom)
+    // Definitions are documented at the URLs used as extension identifiers.
+    /** valueCode: 'full' | 'half' | 'third' */
+    FIELD_WIDTH: 'https://esheet.os.mieweb.org/docs/adapters/fhir/extensions#field-width',
+    /** valueCode: 'stack' | 'wrap' */
+    OPTION_LAYOUT: 'https://esheet.os.mieweb.org/docs/adapters/fhir/extensions#option-layout',
 };
 export const ITEM_CONTROL_SYSTEM = 'http://hl7.org/fhir/questionnaire-item-control';
 // ---------------------------------------------------------------------------
@@ -88,7 +94,7 @@ export function mapFhirTypeToEsheet(fhirType, item) {
             if (hasSignatureRequired(item.extension)) {
                 return { fieldType: 'signature' };
             }
-            return { fieldType: 'diagram' };
+            return { fieldType: 'file' };
         case 'reference':
             return { fieldType: 'text', subType: 'reference' };
         case 'quantity':
@@ -104,6 +110,9 @@ function mapChoiceType(item, itemControl) {
             ? { fieldType: 'multiselectdropdown' }
             : { fieldType: 'dropdown' };
     }
+    if (itemControl === 'open-choice') {
+        return { fieldType: 'openchoice' };
+    }
     if (itemControl === 'check-box') {
         return { fieldType: 'check' };
     }
@@ -144,6 +153,10 @@ export function mapEsheetTypeToFhir(esheetType, inputType, subType) {
             return { type: 'attachment' };
         case 'diagram':
             return { type: 'attachment' };
+        case 'file':
+            return { type: 'attachment' };
+        case 'openchoice':
+            return { type: 'choice', itemControl: 'open-choice' };
         case 'singlematrix':
         case 'multimatrix':
             return { type: 'group' };

package/dist/lib/mcp.d.ts

@@ -125,6 +125,8 @@ export declare function importFromMcp(schema: McpElicitationSchema, options?: {
  * - `check` / `multiselectdropdown` → `array` enum (with or without titles)
  * - `rating`                        → `integer` (min=1, max=option count)
  * - `slider`                        → `number`
+ * - `openchoice`                    → `string` enum with openchoice metadata
+ * - `file`                          → `string` with file metadata (outside MCP spec)
  */
 export declare function exportToMcp(definition: FormDefinition): McpElicitationRequest;
 //# sourceMappingURL=mcp.d.ts.map

package/dist/lib/mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/lib/mcp.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/lib/mcp.ts"],"names":[],"mappings":"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"}

package/dist/lib/mcp.js

@@ -211,6 +211,8 @@ function mcpFormatToInputType(format) {
  * - `check` / `multiselectdropdown` → `array` enum (with or without titles)
  * - `rating`                        → `integer` (min=1, max=option count)
  * - `slider`                        → `number`
+ * - `openchoice`                    → `string` enum with openchoice metadata
+ * - `file`                          → `string` with file metadata (outside MCP spec)
  */
 export function exportToMcp(definition) {
     const properties = {};
@@ -396,6 +398,80 @@ function fieldToMcpProp(field) {
                     : {}),
             };
         }
+        case 'openchoice': {
+            // OpenChoice maps to radio with metadata preserved for round-trip.
+            const options = field.options ?? [];
+            const fieldDef = field;
+            const ocMeta = {
+                ...meta,
+            };
+            if (fieldDef.maxCustomOptions !== undefined) {
+                ocMeta.maxCustomOptions = fieldDef.maxCustomOptions;
+            }
+            if (fieldDef.otherLabel !== undefined) {
+                ocMeta.otherLabel = fieldDef.otherLabel;
+            }
+            const hasText = options.some((o) => o.text !== undefined);
+            if (hasText) {
+                return {
+                    type: 'string',
+                    ...(title !== undefined ? { title } : {}),
+                    ...(description !== undefined ? { description } : {}),
+                    oneOf: options.map((o) => ({
+                        const: o.value,
+                        title: o.text ?? o.value,
+                    })),
+                    ...(Object.keys(ocMeta).length > 0
+                        ? {
+                            _sourceData: {
+                                fieldType: 'openchoice',
+                                ...ocMeta,
+                            },
+                        }
+                        : {}),
+                };
+            }
+            return {
+                type: 'string',
+                ...(title !== undefined ? { title } : {}),
+                ...(description !== undefined ? { description } : {}),
+                enum: options.map((o) => o.value),
+                ...(Object.keys(ocMeta).length > 0
+                    ? {
+                        _sourceData: {
+                            fieldType: 'openchoice',
+                            ...ocMeta,
+                        },
+                    }
+                    : {}),
+            };
+        }
+        case 'file': {
+            // File upload is outside MCP flat-form spec. Preserve as object definition
+            // so export restores field type and constraints verbatim.
+            const fieldDef = field;
+            const fMeta = {
+                ...meta,
+            };
+            if (fieldDef.accept !== undefined) {
+                fMeta.accept = fieldDef.accept;
+            }
+            if (fieldDef.maxFileSize !== undefined) {
+                fMeta.maxFileSize = fieldDef.maxFileSize;
+            }
+            if (fieldDef.maxFiles !== undefined) {
+                fMeta.maxFiles = fieldDef.maxFiles;
+            }
+            return {
+                type: 'string',
+                ...(title !== undefined ? { title } : {}),
+                ...(description !== undefined ? { description } : {}),
+                _sourceData: {
+                    fieldType: 'file',
+                    ...fMeta,
+                },
+            };
+        }
         default:
             // ranking, multitext, singlematrix, multimatrix, image, html,
             // signature, diagram, display → no MCP equivalent

package/dist/lib/surveyjs-converter.d.ts

@@ -29,6 +29,7 @@ interface SurveyJSElement {
     title?: string;
     description?: string;
     isRequired?: boolean;
+    readOnly?: boolean;
     inputType?: string;
     choices?: (string | SurveyJSChoice)[];
     rows?: (string | SurveyJSMatrixItem)[];

package/dist/lib/surveyjs-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"surveyjs-converter.d.ts","sourceRoot":"","sources":["../../src/lib/surveyjs-converter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"surveyjs-converter.d.ts","sourceRoot":"","sources":["../../src/lib/surveyjs-converter.ts"],"names":[],"mappings":"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"}

package/dist/lib/surveyjs-converter.js

@@ -15,6 +15,7 @@ const TYPE_MAP = {
     checkbox: 'check',
     dropdown: 'dropdown',
     tagbox: 'multiselectdropdown',
+    select: 'openchoice',
     boolean: 'boolean',
     rating: 'rating',
     ranking: 'ranking',
@@ -26,7 +27,7 @@ const TYPE_MAP = {
     html: 'html',
     expression: 'html',
     imagepicker: 'radio',
-    file: 'text',
+    file: 'file',
     panel: 'section',
     paneldynamic: 'section',
     multipletext: 'multitext',
@@ -339,6 +340,32 @@ function convertElement(element, ancestorIds = new Set()) {
                 ...base,
                 fieldType: 'signature',
             };
+        case 'file': {
+            const fileField = {
+                ...base,
+                fieldType: 'file',
+            };
+            // Preserve file-specific metadata
+            if (element.acceptedTypes !== undefined) {
+                fileField.accept =
+                    element.acceptedTypes;
+            }
+            if (element.allowMultiple !== undefined) {
+                fileField.maxFiles =
+                    element.allowMultiple ? undefined : 1;
+            }
+            return fileField;
+        }
+        case 'openchoice': {
+            return {
+                ...base,
+                fieldType: 'openchoice',
+                options: (element.choices ?? []).map(convertChoice),
+                ...(element.otherText
+                    ? { otherLabel: element.otherText }
+                    : { otherLabel: 'Other, please specify' }),
+            };
+        }
         case 'image':
             return {
                 ...base,
@@ -520,10 +547,14 @@ function fieldToSurveyElement(field) {
     // Restore original SurveyJS type if available; otherwise use reverse map
     const type = meta?.surveyType ?? FIELD_TYPE_TO_SURVEY[field.fieldType] ?? 'text';
     const el = { type, name };
-    if (field.question !== undefined)
-        el.title = field.question;
+    const q = field.question;
+    if (q !== undefined)
+        el.title = q;
     if (field.required)
         el.isRequired = true;
+    if (field.readOnly) {
+        el.readOnly = true;
+    }
     // Restore conditional expressions verbatim from _sourceData for lossless round-trip.
     // Fall back to re-constructing from parsed rules.
     const visibleRule = field.rules?.find((r) => r.effect === 'visible');
@@ -600,6 +631,7 @@ function fieldToSurveyElement(field) {
         case 'multiselectdropdown':
         case 'ranking':
         case 'rating':
+        case 'openchoice':
             el.choices = (field.options ?? []).map((o) => o.text !== undefined
                 ? {
                     value: o.value,
@@ -608,6 +640,14 @@ function fieldToSurveyElement(field) {
                 }
                 : o.value);
             break;
+        case 'file': {
+            const fileField = field;
+            if (fileField.accept)
+                el.acceptedTypes = fileField.accept;
+            if (fileField.maxFiles)
+                el.allowMultiple = fileField.maxFiles > 1;
+            break;
+        }
         case 'singlematrix':
         case 'multimatrix':
             el.rows = (field.rows ?? []).map((r) => ({ value: r.id, text: r.value }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@esheet/adapters",
-  "version": "0.0.4-1",
+  "version": "0.0.4-2",
   "description": "Convert external form schemas (SurveyJS, etc.) to eSheet FormDefinition",
   "repository": {
     "type": "git",
@@ -32,7 +32,7 @@
     ]
   },
   "dependencies": {
-    "@esheet/core": "0.0.4-1",
+    "@esheet/core": "0.0.4-2",
     "tslib": "^2.3.0"
   },
   "devDependencies": {}