@openhealth/oht-custom-parser-lib 0.5.3 → 0.5.4

package/dist/service/ohtAgnosticMeasurementsExtractor.service.d.ts

@@ -0,0 +1,59 @@
+import { LabToOhtContract, LabToOhtMapper, RangeExtractionResponse, SynonymUnit, UnknownUnits, TransformationRulesChains } from "../types/custom-parser.types";
+import { Biomarker, BiomarkerValueType, Measurement, MeasurementValueComparator, PatientInfo, UnknownMeasurement, Exam } from "../types/oht.types";
+/**
+ * Extracts unit from rawData (OhtExam object)
+ * @param rawData - OhtExam object (not a JSON string)
+ * @param ohtBiomarker - Biomarker information
+ * @param synonymUnits - Synonym units for unit resolution
+ * @param partnerId - Partner ID for synonym resolution
+ */
+declare function agnosticExtractUnit(rawData: any, ohtBiomarker: Biomarker, synonymUnits?: SynonymUnit[] | null, partnerId?: string | null | undefined): {
+    unit: string;
+    isUnitParsedCorrectly: boolean;
+    originalUnit: string;
+    isArbitraryUnit: boolean;
+    unknownUnit: string;
+};
+/**
+ * Extracts reference annotation from rawExam (OhtExam object)
+ * @param labToOhtMapper - Lab to OHT mapper configuration
+ * @param rawExam - OhtExam object (not a JSON string)
+ * @param patientInfo - Patient information
+ * @param documentDate - Document date
+ * @param exams - Array of exams for appended mappings
+ */
+declare function agnosticExtractReferenceAnnotation(labToOhtMapper: LabToOhtMapper, rawExam: any, patientInfo: PatientInfo, documentDate?: Date, exams?: Exam[]): string;
+/**
+ * Extracts reference ranges from rawData (OhtExam object)
+ * Always uses parseRange function from extractionUtils for range extraction
+ */
+declare function agnosticExtractReferenceRanges(labToOhtMapper: LabToOhtMapper, rawData: any, patientInfo: PatientInfo, documentDate?: Date): RangeExtractionResponse;
+declare function agnosticExtractValueFromGreaterLowerThan(value: string): {
+    extractedValue: number | null;
+    extractedValueComparator: MeasurementValueComparator | null;
+    valueParsedCorrectly: boolean;
+};
+/**
+ * Parses exam value from rawExamObj (OhtExam object)
+ * Now uses value directly from ohtExam
+ */
+declare function agnosticParseExamValue(rawExamObj: any, ohtBiomarker: Biomarker): {
+    valueType: BiomarkerValueType;
+    alphanumericalValue: string | null;
+    numberValue: number | null;
+    valueComparator: MeasurementValueComparator;
+    isValueParsedCorrectly: boolean;
+};
+declare function agnosticCheckValueForPlausibleValues(labToOhtMapper: LabToOhtMapper, ohtBiomarker: Biomarker, unit: string, value: number, isUnitParsedCorrectly: boolean): boolean;
+type ApplyTransformationRulesResult = {
+    transformedExams: Exam[];
+    applicationErrorMessages: string[];
+};
+declare function ohtAgnosticMeasurementsExtractor(labToOhtContract: LabToOhtContract, exams: Exam[], transformationRules: TransformationRulesChains, ohtCoreApiKey: string, partnerId?: string | null | undefined): Promise<{
+    measurements: Measurement[];
+    unknownMeasurements: UnknownMeasurement[];
+    unknownUnits: UnknownUnits[];
+    isReportCorrectlyParsed: boolean;
+    transformationRulesErrors: string[];
+}>;
+export { ApplyTransformationRulesResult, ohtAgnosticMeasurementsExtractor, agnosticCheckValueForPlausibleValues, agnosticExtractReferenceRanges, agnosticExtractReferenceAnnotation, agnosticParseExamValue, agnosticExtractUnit, agnosticExtractValueFromGreaterLowerThan };

package/dist/service/ohtAgnosticMeasurementsExtractor.service.js

@@ -0,0 +1,603 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ohtAgnosticMeasurementsExtractor = ohtAgnosticMeasurementsExtractor;
+exports.agnosticCheckValueForPlausibleValues = agnosticCheckValueForPlausibleValues;
+exports.agnosticExtractReferenceRanges = agnosticExtractReferenceRanges;
+exports.agnosticExtractReferenceAnnotation = agnosticExtractReferenceAnnotation;
+exports.agnosticParseExamValue = agnosticParseExamValue;
+exports.agnosticExtractUnit = agnosticExtractUnit;
+exports.agnosticExtractValueFromGreaterLowerThan = agnosticExtractValueFromGreaterLowerThan;
+const dataUtils_1 = require("../util-ts/dataUtils");
+const regexUtils_1 = require("../util-ts/regexUtils");
+const extractionUtils_1 = require("../util-ts/extractionUtils");
+const pinoLogger_1 = __importDefault(require("../util-ts/pinoLogger"));
+const apiUtils_1 = require("../util-ts/apiUtils");
+const oht_types_1 = require("../types/oht.types");
+const transformationRules_service_1 = require("./transformationRules.service");
+const auxiliaryFunctions_service_1 = require("./auxiliaryFunctions.service");
+const logger = (0, pinoLogger_1.default)();
+const OHT_CORE_URL = process.env.OHT_CORE_URL;
+let filename = '';
+/**
+ * Extracts unit from rawData (OhtExam object)
+ * @param rawData - OhtExam object (not a JSON string)
+ * @param ohtBiomarker - Biomarker information
+ * @param synonymUnits - Synonym units for unit resolution
+ * @param partnerId - Partner ID for synonym resolution
+ */
+function agnosticExtractUnit(rawData, ohtBiomarker, synonymUnits = null, partnerId = null) {
+    if (!(0, dataUtils_1.isBiomarkerValueNumerical)(ohtBiomarker)) {
+        return { unit: "None", isUnitParsedCorrectly: true, originalUnit: "", isArbitraryUnit: false, unknownUnit: '' };
+    }
+    const isArbitraryUnit = ohtBiomarker.acf.standardUnitArbUnitLogic === 'default';
+    let originalUnit = '';
+    // Use unit directly from ohtExam
+    const unit = rawData?.unit ?? '';
+    let unitLowerCase = unit?.toLowerCase();
+    unitLowerCase = unitLowerCase?.replaceAll(/ /g, '') ?? '';
+    const standardUnit = ohtBiomarker.acf.standardUnit;
+    const allBmOhtUnits = [
+        standardUnit?.toLowerCase(),
+        ...ohtBiomarker.acf?.alternativeUnits
+            ?.map((bmAlternative) => bmAlternative.name.toLowerCase()) ?? []
+    ];
+    // If the biomarker uses an arbitrary unit, return standard unit and set the original unit as the unit extracted from the data
+    if (isArbitraryUnit) {
+        originalUnit = unit;
+        return { unit: standardUnit, isUnitParsedCorrectly: true, originalUnit: originalUnit, isArbitraryUnit: isArbitraryUnit, unknownUnit: '' };
+    }
+    // First test if the biomarker has the unit explicit in the 'unity' field
+    const allUnitContainsJsonUnit = allBmOhtUnits.includes(unitLowerCase);
+    if (unitLowerCase?.length > 0 && allUnitContainsJsonUnit) {
+        // Find the original case version from standardUnit or alternativeUnits
+        let matchedUnit = standardUnit?.toLowerCase().replaceAll(/ /g, '') === unitLowerCase
+            ? standardUnit?.replaceAll(/ /g, '')
+            : ohtBiomarker.acf?.alternativeUnits?.find((bmAlternative) => bmAlternative.name.toLowerCase().replaceAll(/ /g, '') === unitLowerCase)?.name?.replaceAll(/ /g, '');
+        // Fallback to original unit if no match found (shouldn't happen, but safety check)
+        matchedUnit = matchedUnit || unit?.replaceAll(/ /g, '');
+        return {
+            unit: matchedUnit,
+            isUnitParsedCorrectly: true,
+            originalUnit: originalUnit,
+            isArbitraryUnit: isArbitraryUnit,
+            unknownUnit: ''
+        };
+    }
+    // Check if there are any Synonym configured
+    if (unitLowerCase?.length > 0) {
+        let resolvedUnit = null;
+        if (synonymUnits && synonymUnits.length > 0) {
+            const resolved = (0, dataUtils_1.resolveUnitFromSynonyms)(unitLowerCase, ohtBiomarker.id, partnerId, synonymUnits);
+            if (resolved.found && resolved.targetUnit) {
+                resolvedUnit = resolved.targetUnit;
+            }
+        }
+        if (resolvedUnit) {
+            const allUnitContainsJsonUnitSynonyms = allBmOhtUnits.includes(resolvedUnit.toLowerCase());
+            if (allUnitContainsJsonUnitSynonyms) {
+                return { unit: resolvedUnit, isUnitParsedCorrectly: true, originalUnit: originalUnit, isArbitraryUnit: isArbitraryUnit, unknownUnit: '' };
+            }
+        }
+    }
+    // if the unit didnt match any of the cases, add the unit to an unknownUnit list
+    return { unit: '', isUnitParsedCorrectly: false, originalUnit: '', isArbitraryUnit: false, unknownUnit: unit };
+}
+/**
+ * Extracts reference annotation from rawExam (OhtExam object)
+ * @param labToOhtMapper - Lab to OHT mapper configuration
+ * @param rawExam - OhtExam object (not a JSON string)
+ * @param patientInfo - Patient information
+ * @param documentDate - Document date
+ * @param exams - Array of exams for appended mappings
+ */
+function agnosticExtractReferenceAnnotation(labToOhtMapper, rawExam, patientInfo, documentDate, exams) {
+    let annotation = '';
+    // if it is an appended mapping, add the extracted values to annotation
+    if (labToOhtMapper?.annotationConfig?.enabled) {
+        const appendedResult = (0, dataUtils_1.processAppendedMappings)(exams, labToOhtMapper.annotationConfig.labKeys, filename, {
+            maxLength: labToOhtMapper.annotationConfig.maxLength,
+            fallbackValue: labToOhtMapper.annotationConfig.fallbackValue,
+            separator: labToOhtMapper.annotationConfig.separator
+        });
+        if (appendedResult.text?.length) {
+            annotation += appendedResult.text;
+        }
+    }
+    // Use annotation directly from ohtExam
+    const extractedReference = rawExam?.annotation ?? '';
+    if (extractedReference?.length) {
+        annotation += annotation ? `\n${extractedReference}` : extractedReference;
+    }
+    return annotation || undefined;
+}
+/**
+ * Extracts reference ranges from rawData (OhtExam object)
+ * Always uses parseRange function from extractionUtils for range extraction
+ */
+function agnosticExtractReferenceRanges(labToOhtMapper, rawData, patientInfo, documentDate) {
+    const nullRangeNotParsedCorrectly = { from: null, to: null, isRangeParsedCorrectly: false };
+    const nullRangeParsedCorrectly = { from: null, to: null, isRangeParsedCorrectly: true };
+    // if internalRange return null, but is parsed correctly
+    if (labToOhtMapper?.rangeExtraction?.useInternalRange) {
+        return nullRangeParsedCorrectly;
+    }
+    // Always use parseRange function from extractionUtils
+    const rangeExtractionResult = (0, extractionUtils_1.parseRange)(rawData, labToOhtMapper, patientInfo);
+    if (rangeExtractionResult.isRangeParsedCorrectly) {
+        return rangeExtractionResult;
+    }
+    return nullRangeNotParsedCorrectly;
+}
+function agnosticExtractValueFromGreaterLowerThan(value) {
+    // Checks first if any greater than pattern is present
+    const greaterThanPatterns = (0, regexUtils_1.getGreaterThanPatterns)();
+    const lowerThanPatterns = (0, regexUtils_1.getLowerThanPatterns)();
+    value = value.toLowerCase();
+    for (const pattern of greaterThanPatterns) {
+        const match = pattern.exec(value);
+        if (match) {
+            const value = parseFloat(match?.[1].replaceAll(',', '.'));
+            const valueComparator = oht_types_1.MeasurementValueComparator.GREATER_THAN;
+            return {
+                extractedValue: value,
+                extractedValueComparator: valueComparator,
+                valueParsedCorrectly: !Number.isNaN(value)
+            };
+        }
+    }
+    // Checks if any lower than pattern is present
+    for (const pattern of lowerThanPatterns) {
+        const match = pattern.exec(value);
+        if (match) {
+            const value = parseFloat(match?.[1].replaceAll(',', '.'));
+            const valueComparator = oht_types_1.MeasurementValueComparator.LESS_THAN;
+            return {
+                extractedValue: value,
+                extractedValueComparator: valueComparator,
+                valueParsedCorrectly: !Number.isNaN(value)
+            };
+        }
+    }
+    // If no pattern is found, return the value as is and the comparator as EQUAL and isValueParsedCorrectly as false
+    return { extractedValue: null, extractedValueComparator: null, valueParsedCorrectly: false };
+}
+/**
+ * Parses exam value from rawExamObj (OhtExam object)
+ * Now uses value directly from ohtExam
+ */
+function agnosticParseExamValue(rawExamObj, ohtBiomarker) {
+    // Use value directly from ohtExam
+    let value = rawExamObj?.value ?? '';
+    // Normalize to string for parseFloat
+    if (value != null) {
+        value = String(value);
+    }
+    else {
+        value = '';
+    }
+    // If is parse float nan, the value is alphanumerical
+    const valueType = (0, dataUtils_1.isBiomarkerValueNumerical)(ohtBiomarker)
+        ? oht_types_1.BiomarkerValueType.NUMERICAL
+        : oht_types_1.BiomarkerValueType.ALPHANUMERICAL;
+    let alphanumericalValue = Number.isNaN(parseFloat(value))
+        ? value
+        : null;
+    if (valueType === oht_types_1.BiomarkerValueType.ALPHANUMERICAL
+        && !Number.isNaN(parseFloat(value))) {
+        // convert numberValue to string
+        alphanumericalValue = value.toString();
+    }
+    if (valueType === oht_types_1.BiomarkerValueType.NUMERICAL
+        && Number.isNaN(parseFloat(value))) {
+        // convert numberValue to string
+        const { extractedValue, extractedValueComparator, valueParsedCorrectly } = agnosticExtractValueFromGreaterLowerThan(value);
+        return {
+            valueType,
+            alphanumericalValue,
+            numberValue: extractedValue,
+            valueComparator: extractedValueComparator ?? oht_types_1.MeasurementValueComparator.EQUAL,
+            isValueParsedCorrectly: valueParsedCorrectly
+        };
+    }
+    if (valueType === 'NUMERICAL') {
+        return {
+            valueType,
+            alphanumericalValue,
+            numberValue: parseFloat(value),
+            valueComparator: oht_types_1.MeasurementValueComparator.EQUAL,
+            isValueParsedCorrectly: !Number.isNaN(parseFloat(value))
+        };
+    }
+    if (valueType === 'ALPHANUMERICAL') {
+        return {
+            valueType,
+            alphanumericalValue,
+            numberValue: parseFloat(value),
+            valueComparator: oht_types_1.MeasurementValueComparator.EQUAL,
+            isValueParsedCorrectly: Boolean(alphanumericalValue)
+        };
+    }
+    return {
+        valueType,
+        alphanumericalValue,
+        numberValue: null,
+        valueComparator: oht_types_1.MeasurementValueComparator.EQUAL,
+        isValueParsedCorrectly: false
+    };
+}
+function agnosticCheckValueForPlausibleValues(labToOhtMapper, ohtBiomarker, unit, value, isUnitParsedCorrectly) {
+    if (!(0, dataUtils_1.isBiomarkerValueNumerical)(ohtBiomarker) && isUnitParsedCorrectly) {
+        return true;
+    }
+    const standardUnit = ohtBiomarker.acf.standardUnit;
+    const plausibleLowerValue = ohtBiomarker.acf.plausibilityRangeCheck;
+    const plausibleUpperValue = ohtBiomarker.acf.plausibilityRangeCheckHigh;
+    const biomarkerStdValueDecimals = ohtBiomarker.acf?.displayDecimals ?? 2;
+    if (unit !== standardUnit) {
+        const alternativeUnit = (Array.isArray(ohtBiomarker.acf?.alternativeUnits)
+            ? ohtBiomarker.acf?.alternativeUnits
+            : [])?.find((altUnit) => altUnit.name === unit);
+        if (alternativeUnit) {
+            const conversionFactor = alternativeUnit.conversionFactor;
+            value = +(value * conversionFactor).toFixed(biomarkerStdValueDecimals);
+        }
+    }
+    const isPlausibleValue = value >= plausibleLowerValue && value <= plausibleUpperValue;
+    // Log if the value is not plausible
+    if (!isPlausibleValue) {
+        logger.warn({ labToOhtMapper, value, standardUnit, plausibleLowerValue, plausibleUpperValue, filename }, `Value "${value} ${standardUnit}" not plausible "${plausibleLowerValue} to ${plausibleUpperValue}" for "${labToOhtMapper.ohtBmId}" | "${labToOhtMapper.ohtExam.labKey}", filename: ${filename}`);
+    }
+    return isPlausibleValue;
+}
+/**
+ * Apply transformation rules to exams
+ * This function applies transformation rules chain to each exam, passing all exams as context
+ *
+ * @param exams - Array of original exam objects
+ * @param transformationRules - Mapping of labKey to transformation rule chains
+ * @param labToOhtContract - The contract containing patient info and other context
+ * @returns Promise<Exam[]> - Array of transformed exams
+ */
+async function applyTransformationRulesToExams(exams, transformationRules, patientInfo, documentDate) {
+    if (transformationRules.size === 0) {
+        return {
+            transformedExams: exams,
+            applicationErrorMessages: []
+        };
+    }
+    const transformedExams = [];
+    // Prepare context for transformation rules
+    const reportContext = {
+        patient: {
+            sex: patientInfo.sex,
+            birthdate: patientInfo.birthdate,
+            age: (0, auxiliaryFunctions_service_1.getPatientAge)(documentDate, patientInfo.birthdate),
+        }
+    };
+    // Prepare the OHT exam data
+    const ohtReport = {
+        exams: exams.map(e => e.ohtExam),
+    };
+    logger.info({ examsCount: exams.length, chainsCount: transformationRules.size, filename }, 'Applying transformation rules to exams...');
+    let labKeysWithRulesCount = 0;
+    let transformedLabKeysCount = 0;
+    const applicationErrorMessages = [];
+    for (const exam of exams) {
+        const labKey = exam.ohtExam.labKey;
+        const rulesChain = transformationRules.get(labKey);
+        if (!rulesChain || rulesChain.length === 0) {
+            transformedExams.push(exam);
+            continue;
+        }
+        labKeysWithRulesCount++;
+        try {
+            const result = await (0, transformationRules_service_1.applyRules)(rulesChain, exam.ohtExam, {
+                ohtReportJson: ohtReport,
+                contextJson: reportContext,
+            });
+            if (result.errors.length > 0) {
+                logger.warn({ labKey, errors: result.errors, filename }, 'Errors applying transformation rule(s) for labKey.');
+                applicationErrorMessages.push(`${labKey}: ${result.errors.map(e => `(rule ID ${e.ruleId}) ${e.error}`).join('; ')}`);
+            }
+            else {
+                if (result.appliedRules.length > 0) {
+                    transformedLabKeysCount++;
+                }
+                logger.info({ labKey, appliedRules: result.appliedRules.length, filename }, 'Done applying transformation rule(s) for labKey.');
+                // Add the transformed exam to the result array only if there are no errors in the chain
+                transformedExams.push({
+                    ohtExam: result.data,
+                    originalExam: exam.originalExam
+                });
+            }
+        }
+        catch (error) {
+            logger.error({ labKey, error, filename }, 'Failed to apply transformation rules for labKey.');
+            applicationErrorMessages.push(`${labKey}: Unhandled error occurred.`);
+        }
+    }
+    logger.info({
+        filename,
+        examsCount: exams.length,
+        chainsCount: transformationRules.size,
+        transformedLabKeysCount,
+        labKeysWithRulesCount,
+    }, 'Done applying the transformation rules to exams.');
+    return {
+        transformedExams,
+        applicationErrorMessages
+    };
+}
+async function ohtAgnosticMeasurementsExtractor(labToOhtContract, exams, transformationRules, ohtCoreApiKey, partnerId) {
+    filename = labToOhtContract.sourceFilename;
+    const measurements = [];
+    const unknownMeasurements = [];
+    const unknownUnits = [];
+    let isReportCorrectlyParsed = true;
+    let transformationRulesErrors = [];
+    // Apply transformation rules to all exams
+    let transformedExamsResult = { transformedExams: [], applicationErrorMessages: [] };
+    try {
+        transformedExamsResult = await applyTransformationRulesToExams(exams, transformationRules, labToOhtContract.patientInfo, labToOhtContract.documentDate);
+    }
+    catch (error) {
+        logger.error({ error, filename }, 'Unhandled error while applying transformation rules to exams.');
+        labToOhtContract.errorMessages.push({
+            destination: { slack: true, notes: true, bi: false },
+            message: `Failed applying the transformation rules for filename ${filename}. ${error instanceof Error ? error.message : error}`,
+        });
+    }
+    if (transformedExamsResult.applicationErrorMessages.length > 0) {
+        transformationRulesErrors = transformedExamsResult.applicationErrorMessages;
+        labToOhtContract.errorMessages.push({
+            destination: { slack: false, notes: true, bi: false },
+            message: `Failed applying some transformation rules:\n${transformedExamsResult.applicationErrorMessages.map((e) => `  - ${e}`).join("\n\n")}`,
+        });
+    }
+    const transformedExams = transformedExamsResult.transformedExams;
+    const transformedExamsMap = transformedExams.reduce((map, exam) => map.set(exam.ohtExam.labKey, exam), new Map());
+    const allPossibleOHTBmIds = [];
+    [
+        ...Object.values(labToOhtContract.labToOhtList)
+    ].forEach(labToOhtMapper => {
+        if (labToOhtMapper.ohtBmId) {
+            allPossibleOHTBmIds.push(labToOhtMapper.ohtBmId);
+        }
+    });
+    // data to request api
+    const requestData = {
+        "biomarkerIds": allPossibleOHTBmIds,
+        "page": 1,
+        "pageSize": allPossibleOHTBmIds.length
+    };
+    // api call to ohtCore to find biomarkers.
+    const biomarkers = await (0, apiUtils_1.makeApiCallWithRetry)('post', `${OHT_CORE_URL}/v1/biomarker/biomarkers`, requestData, ohtCoreApiKey);
+    // Fetch synonym units from API if enabled
+    let synonymUnits = null;
+    if (partnerId) {
+        synonymUnits = await (0, dataUtils_1.fetchSynonymUnits)(partnerId, ohtCoreApiKey);
+        // If API fetch failed or returned empty, set to null to use hardcoded fallback
+        if (synonymUnits.length === 0) {
+            synonymUnits = null;
+        }
+    }
+    labToOhtContract.labToOhtList.forEach((labToOhtMapper) => {
+        let isMeasurementCorrectlyParsed = true;
+        if (!labToOhtMapper.ohtExam) {
+            labToOhtContract.errorMessages.push({
+                destination: { slack: true, notes: false, bi: false },
+                message: `Missing ohtExam for labKey: ${labToOhtMapper.ohtExam?.labKey || 'unknown'} filename: ${filename}`,
+            });
+            return;
+        }
+        // Get the transformed exam for this labKey, or use the original ohtExam
+        const transformedExam = transformedExamsMap.get(labToOhtMapper.ohtExam.labKey);
+        const examObj = transformedExam ? transformedExam.ohtExam : labToOhtMapper.ohtExam;
+        if (labToOhtMapper?.ohtBmId && labToOhtMapper?.ohtBmId !== -1) {
+            // if BM is already in measurements, continue to the next one
+            if (measurements.some(measurement => measurement.biomarkerId === labToOhtMapper.ohtBmId)) {
+                logger.warn({ labToOhtMapper }, `Biomarker already in measurements array, should investigate, filename: ${filename}`);
+                labToOhtContract.errorMessages.push({
+                    destination: { slack: false, notes: false, bi: true },
+                    message: `Biomarkers Duplicated keys:[PLACEHOLDER]`,
+                    item: `bmId:${labToOhtMapper.ohtBmId}, labKey:${examObj.labKey}`
+                });
+                return;
+            }
+            const ohtBiomarker = biomarkers?.data?.items.find((bm) => bm.id === labToOhtMapper.ohtBmId);
+            // Used for error messages
+            const bmInfo = ohtBiomarker?.acf?.shortName ?
+                `name:${ohtBiomarker.acf.shortName}, bmId:${labToOhtMapper.ohtBmId}, labKey:${examObj.labKey}` :
+                `bmId:${labToOhtMapper.ohtBmId}, labKey:${examObj.labKey}`;
+            const { unit, isUnitParsedCorrectly, originalUnit, isArbitraryUnit, unknownUnit } = agnosticExtractUnit(examObj, ohtBiomarker, synonymUnits, partnerId);
+            if (unknownUnit.length > 0) {
+                unknownUnits.push({
+                    biomarkerId: ohtBiomarker.id,
+                    unit: unknownUnit,
+                    partnerId: partnerId,
+                    labKey: examObj.labKey,
+                    ohtExam: labToOhtMapper.ohtExam,
+                    originalExam: labToOhtMapper.originalExam,
+                    biomarkerName: examObj.mnemonic || '',
+                    dataImportFileUploadId: null, // is null it will be set later in the structParser.service.ts
+                });
+            }
+            if (!isUnitParsedCorrectly) {
+                logger.warn({ labToOhtMapper }, `Unit not extracted correctly for "${labToOhtMapper.ohtBmId}|${examObj.labKey}", filename: ${filename}`);
+                labToOhtContract.errorMessages.push({
+                    destination: { slack: true, notes: true, bi: true },
+                    message: `Unit not extracted correctly for:[PLACEHOLDER]`,
+                    item: `${bmInfo}`
+                });
+                isMeasurementCorrectlyParsed = false;
+            }
+            let { valueType, alphanumericalValue, numberValue, valueComparator, isValueParsedCorrectly } = agnosticParseExamValue(examObj, ohtBiomarker);
+            if (!isValueParsedCorrectly) {
+                logger.warn({ labToOhtMapper }, `Value not extracted correctly for "${labToOhtMapper.ohtBmId}|${examObj.labKey}", filename: ${filename}`);
+                labToOhtContract.errorMessages.push({
+                    destination: { slack: true, notes: true, bi: true },
+                    message: `Value not extracted correctly for:[PLACEHOLDER]`,
+                    item: `${bmInfo}`
+                });
+                isMeasurementCorrectlyParsed = false;
+            }
+            if ((0, dataUtils_1.isNumericalWithoutValidResult)(valueType, numberValue, alphanumericalValue)) {
+                const alphanumericalValueTrimmed = alphanumericalValue?.trim() ?? '';
+                const unknownMeasurement = {
+                    labKey: examObj.labKey,
+                    biomarkerName: examObj.description ?? '',
+                    value: alphanumericalValueTrimmed,
+                    unit: unit ?? '',
+                    annotation: examObj.annotation ?? '',
+                    dataOrigin: [{
+                            itemExtracted: 'measurement',
+                            method: 'custom-parser',
+                            methodVersion: 'oht-custom-parser-lib',
+                            path: 'exams',
+                        }],
+                    originalName: examObj.examName ?? '',
+                    originalExam: {
+                        contentType: 'application/json',
+                        exam: JSON.stringify(examObj)
+                    },
+                    ohtExam: examObj
+                };
+                unknownMeasurements.push(unknownMeasurement);
+                return;
+            }
+            // Check if the value is plausible
+            if (isValueParsedCorrectly && valueType === 'NUMERICAL') {
+                const isPlausibleValue = numberValue !== null && agnosticCheckValueForPlausibleValues(labToOhtMapper, ohtBiomarker, unit, numberValue, isUnitParsedCorrectly);
+                if (!isPlausibleValue) {
+                    logger.warn({ labToOhtMapper }, `Value [${numberValue} ${unit}] is not plausible for "${labToOhtMapper.ohtBmId}|${examObj.labKey}", filename: ${filename}`);
+                    labToOhtContract.errorMessages.push({
+                        destination: { slack: true, notes: true, bi: true },
+                        message: `Value is not plausible for:[PLACEHOLDER]`,
+                        item: `${bmInfo}, value:${numberValue}${unit}`
+                    });
+                    isMeasurementCorrectlyParsed = false;
+                }
+            }
+            let from = null, to = null;
+            let isRangeParsedCorrectly = true;
+            // If the biomarker is numerical, extract the reference range
+            if ((0, dataUtils_1.isBiomarkerValueNumerical)(ohtBiomarker)) {
+                const extractedRange = agnosticExtractReferenceRanges(labToOhtMapper, examObj, labToOhtContract.patientInfo, labToOhtContract.documentDate);
+                from = extractedRange.from ?? null;
+                to = extractedRange.to ?? null;
+                isRangeParsedCorrectly = extractedRange.isRangeParsedCorrectly;
+                if (!isRangeParsedCorrectly) {
+                    logger.warn({ labToOhtMapper }, `Range not extracted correctly for "${labToOhtMapper.ohtBmId}|${examObj.labKey}", filename: ${filename}`);
+                    labToOhtContract.errorMessages.push({
+                        destination: { slack: true, notes: true, bi: true },
+                        message: `Range not extracted correctly for:[PLACEHOLDER]`,
+                        item: `${bmInfo}`
+                    });
+                    isMeasurementCorrectlyParsed = false;
+                }
+            }
+            let extractedAnnotation;
+            if (labToOhtMapper?.referenceAsAnnotation?.use || labToOhtMapper?.annotationConfig?.enabled) {
+                extractedAnnotation = agnosticExtractReferenceAnnotation(labToOhtMapper, examObj, labToOhtContract.patientInfo, labToOhtContract.documentDate, transformedExams);
+            }
+            // Use material and method directly from ohtExam
+            const material = examObj?.material ?? '';
+            const method = examObj?.method ?? '';
+            let alphaValue = !(0, dataUtils_1.isBiomarkerValueNumerical)(ohtBiomarker) && alphanumericalValue
+                ? alphanumericalValue.trim()
+                : '';
+            // adding unit for alphanumerical values as number.
+            if (!Number.isNaN(parseFloat(alphaValue))) {
+                // Use unit directly from ohtExam
+                let originalUnit = examObj?.unit ?? '';
+                originalUnit = originalUnit?.replaceAll(/ /g, '') ?? '';
+                alphaValue = alphaValue && unit?.length > 0 ? `${alphaValue} ${originalUnit}`.trim() : alphaValue;
+            }
+            // adding dates for measurements in ISO 8601 format
+            const collectionDate = examObj.collectionDate ? new Date(examObj.collectionDate).toISOString() : null;
+            const effectiveDate = examObj.effectiveDate ? new Date(examObj.effectiveDate).toISOString() : null;
+            const examCollectionDate = examObj.examCollectionDate ? new Date(examObj.examCollectionDate).toISOString() : null;
+            const examEffectiveDate = examObj.examEffectiveDate ? new Date(examObj.examEffectiveDate).toISOString() : null;
+            // add original name for document search
+            const originalName = examObj.examName ?? '';
+            let measurement = {
+                biomarkerId: ohtBiomarker.id,
+                valueType,
+                value: (0, dataUtils_1.isBiomarkerValueNumerical)(ohtBiomarker) ? numberValue : null,
+                alphanumericValue: alphaValue,
+                rangeAnnotation: extractedAnnotation ? extractedAnnotation : null,
+                showVisualisationIfAnnotated: false, // TODO: WHAT SHOULD BE THE DEFAULT VALUE?
+                comparator: valueComparator ?? oht_types_1.MeasurementValueComparator.EQUAL,
+                minNormalValue: from,
+                maxNormalValue: to,
+                unit,
+                originalUnit,
+                isArbitraryUnit,
+                material,
+                method,
+                isDigitalizationApproved: isMeasurementCorrectlyParsed,
+                isManualChecked: isMeasurementCorrectlyParsed,
+                collectionDate: collectionDate,
+                effectiveDate: effectiveDate,
+                examCollectionDate: examCollectionDate,
+                examEffectiveDate: examEffectiveDate,
+                originalName: originalName,
+            };
+            measurements.push(measurement);
+        }
+        else {
+            const labKey = examObj.labKey;
+            logger.warn(`Created an ungroupedBiomarker for id: ${labKey}, filename: ${filename}`);
+            labToOhtContract.errorMessages.push({
+                destination: { slack: false, notes: false, bi: true },
+                message: `Created ungroupedBiomarkers for:[PLACEHOLDER]`,
+                item: `labKey:${labKey}`
+            });
+            const biomarkerName = labToOhtMapper?.unknownMeasurement?.biomarkerName ?? '';
+            const value = labToOhtMapper?.unknownMeasurement?.value ?? '';
+            const unit = labToOhtMapper?.unknownMeasurement?.unit ?? '';
+            const annotation = labToOhtMapper?.unknownMeasurement?.annotation ?? '';
+            const originalName = labToOhtMapper?.unknownMeasurement?.originalName ?? '';
+            const originalExam = labToOhtMapper?.unknownMeasurement?.originalExam
+                ? {
+                    contentType: typeof labToOhtMapper.unknownMeasurement.originalExam.contentType === 'string'
+                        ? labToOhtMapper.unknownMeasurement.originalExam.contentType
+                        : '',
+                    exam: typeof labToOhtMapper.unknownMeasurement.originalExam.exam === 'string'
+                        ? labToOhtMapper.unknownMeasurement.originalExam.exam
+                        : String(labToOhtMapper.unknownMeasurement.originalExam.exam || '')
+                }
+                : { contentType: '', exam: '' };
+            const ohtExam = labToOhtMapper?.unknownMeasurement?.ohtExam
+                ? labToOhtMapper.unknownMeasurement.ohtExam
+                : { labKey: '', value: '', unit: '', collectionDate: '', documentDate: '', description: '', mnemonic: '', examName: '', range: [], annotation: '' };
+            const dataOrigin = labToOhtMapper?.unknownMeasurement?.dataOrigin
+                ? [labToOhtMapper?.unknownMeasurement?.dataOrigin]
+                : [{ path: '' }];
+            const unknownMeasurement = {
+                labKey: labKey,
+                biomarkerName: biomarkerName,
+                value: value,
+                unit: unit,
+                annotation: annotation,
+                dataOrigin: dataOrigin,
+                originalName: originalName,
+                originalExam: originalExam,
+                ohtExam: ohtExam
+            };
+            unknownMeasurements.push(unknownMeasurement);
+        }
+        isReportCorrectlyParsed = isReportCorrectlyParsed && isMeasurementCorrectlyParsed;
+    });
+    return {
+        measurements,
+        unknownMeasurements,
+        unknownUnits,
+        isReportCorrectlyParsed,
+        transformationRulesErrors,
+    };
+}
+//# sourceMappingURL=ohtAgnosticMeasurementsExtractor.service.js.map

package/dist/service/ohtAgnosticMeasurementsExtractor.service.js.map

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

package/dist/service/reportCreator.service.d.ts

@@ -4,6 +4,6 @@ import { UnknownUnits } from '../types/custom-parser.types';
  * Posts report preview data (measurements and unknownMeasurements) to OHT Core API.
  * Uses the shared makeApiCallWithRetry helper (Basic auth) from oht-custom-parser-lib.
  */
-declare function postReportPreviewToCore(reportPreviewId: string, measurements: Measurement[], unknownMeasurements: UnknownMeasurement[], filename: string, unknownUnits: UnknownUnits[], partnerId: string, ohtCoreApiKey: string): Promise<void>;
+declare function postReportPreviewToCore(reportPreviewId: string, measurements: Measurement[], unknownMeasurements: UnknownMeasurement[], filename: string, unknownUnits: UnknownUnits[], partnerId: string, isReportParsedCorrectly: boolean, notes: string, ohtCoreApiKey: string): Promise<void>;
 declare function postDataImportFileUploadToCore(dataImportFileUpload: DataImportFileUpload, unknownMeasurements: UnknownMeasurementsBulk, unknownUnits: UnknownUnits[], rejectedStatus: string | undefined, rejectReason: string | undefined, isReportParsedCorrectly: boolean, filename: string, ohtCoreApiKey: string): Promise<DataImportFileUpload | null>;
 export { postDataImportFileUploadToCore, postReportPreviewToCore };

package/dist/service/reportCreator.service.js

@@ -16,10 +16,13 @@ const OHT_CORE_URL = process.env.OHT_CORE_URL;
  * Posts report preview data (measurements and unknownMeasurements) to OHT Core API.
  * Uses the shared makeApiCallWithRetry helper (Basic auth) from oht-custom-parser-lib.
  */
-async function postReportPreviewToCore(reportPreviewId, measurements, unknownMeasurements, filename, unknownUnits, partnerId, ohtCoreApiKey) {
+async function postReportPreviewToCore(reportPreviewId, measurements, unknownMeasurements, filename, unknownUnits, partnerId, isReportParsedCorrectly, notes, ohtCoreApiKey) {
     if (!OHT_CORE_URL) {
         throw new Error(`ERROR: OHT_CORE_URL is required for report preview, filename: ${filename}`);
     }
+    let status = isReportParsedCorrectly
+        ? oht_types_1.DataImportFileUploadStatus.READY
+        : oht_types_1.DataImportFileUploadStatus.FOR_REVIEW;
     const apiUrl = `${OHT_CORE_URL}/v1/report-preview/${reportPreviewId}`;
     // send unknown units to the server
     if (unknownUnits.length > 0) {
@@ -36,9 +39,10 @@ async function postReportPreviewToCore(reportPreviewId, measurements, unknownMea
     }
     // Always send both arrays, with empty arrays if no data
     const requestBody = {
-        status: 'READY',
+        status: status,
         measurements: measurements || [],
         unknownMeasurements: unknownMeasurements || [],
+        notes: notes,
     };
     processingLogger_service_1.processingLogger.logInfo(`postReportPreviewToCore: Sending report preview to OHT Core API (${(measurements || []).length} measurements, ${(unknownMeasurements || []).length} unknownMeasurements), filename: ${filename}`, {
         filename,
@@ -58,6 +62,7 @@ async function postReportPreviewToCore(reportPreviewId, measurements, unknownMea
             http_status: response?.status,
             response_message: typeof responseData?.message === 'string' ? responseData.message : undefined,
             response_status: responseData?.status,
+            hasNotes: Boolean(notes?.trim()),
         });
     }
     catch (apiError) {

package/dist/service/reportCreator.service.js.map

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

package/package.json

@@ -1,36 +1,36 @@
-{
-  "name": "@openhealth/oht-custom-parser-lib",
-  "version": "0.5.3",
-  "description": "Shared nodejs lib with with reusable functions",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "/dist"
-  ],
-  "scripts": {
-    "test": "jest"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@google-cloud/pubsub": "^4.10.0",
-    "@google-cloud/storage": "^7.7.0",
-    "axios": "^1.13.2",
-    "bottleneck": "^2.19.5",
-    "dayjs": "^1.11.13",
-    "dotenv": "^16.4.5",
-    "jsonata": "^2.1.0",
-    "moment": "^2.30.1",
-    "mongodb": "^6.3.0",
-    "pino": "^8.19.0",
-    "pino-pretty": "^11.3.0"
-  },
-  "devDependencies": {
-    "@types/jest": "^29.5.14",
-    "axios-mock-adapter": "^2.1.0",
-    "jest": "^29.7.0",
-    "ts-jest": "^29.2.5",
-    "typescript": "^5.0.0"
-  }
-}
+{
+  "name": "@openhealth/oht-custom-parser-lib",
+  "version": "0.5.4",
+  "description": "Shared nodejs lib with with reusable functions",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "/dist"
+  ],
+  "scripts": {
+    "test": "jest"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@google-cloud/pubsub": "^4.10.0",
+    "@google-cloud/storage": "^7.7.0",
+    "axios": "^1.13.2",
+    "bottleneck": "^2.19.5",
+    "dayjs": "^1.11.13",
+    "dotenv": "^16.4.5",
+    "jsonata": "^2.1.0",
+    "moment": "^2.30.1",
+    "mongodb": "^6.3.0",
+    "pino": "^8.19.0",
+    "pino-pretty": "^11.3.0"
+  },
+  "devDependencies": {
+    "@types/jest": "^29.5.14",
+    "axios-mock-adapter": "^2.1.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.0.0"
+  }
+}

package/readme.md

@@ -1,115 +1,115 @@
-# oht-custom-parser-lib
-
-`oht-custom-parser-lib` is a shared library designed for use across multiple Node.js cloud functions. It contains common MongoDB connectors and data utilities that can be reused to avoid code duplication and ensure consistency.
-
-## Table of Contents
-
-- [Installation](#installation)
-- [Usage](#usage)
-- [Development](#development)
-    - [Patch Versions](#patch-versions)
-    - [Publish to npm Registry](#publish-to-npm-registry)
-- [Using the Library in Cloud Functions](#using-the-library-in-cloud-functions)
-
-## Installation
-
-To install `oht-custom-parser-lib`, you can add it as a dependency in your project using npm:
-
-```bash
-npm install oht-custom-parser-lib
-```
-
-Or, if you want to install a specific version:
-
-```bash
-npm install oht-custom-parser-lib@<version>
-```
-
-## Usage
-
-After installing, you can import and use the library in your cloud functions:
-
-```javascript
-const { connectToMongoDB } = require('oht-custom-parser-lib');
-```
-
-## Logging
-
-- **Production / GCP**: Logs are emitted as JSON (one line per log) for Cloud Logging.
-- **Local / development**: When `NODE_ENV !== 'production'`, logs are pretty-printed in the terminal (colors, timestamps, readable structure). You can override: `LOG_PRETTY=true` to force pretty output, or `LOG_PRETTY=false` to force JSON when not in production.
-
-### Processing logger: request-scoped state
-
-The processing logger (`processingLogger`, `runWithContextAsync`, `getRequestIdFromContext`) uses a **registry + facade** so each request has isolated state and logs never leak context between concurrent invocations (e.g. in Cloud Functions).
-
-- **Registry**: One `ProcessingState` per request, keyed by request id (`fileUploadId ?? messageId ?? cloudEventId ?? generatedId`). The same id is used for the whole request.
-- **AsyncLocalStorage**: Holds only the current request id; state is resolved via `registry.get(id)`.
-- **Entry point**: Wrap your handler in `runWithContextAsync(context, async () => { ... })`. The lib creates a registry entry, runs your callback with the id in AsyncLocalStorage, and removes the entry in a `finally` block.
-- **Clear-state rule**: If there is no request id or the id is not in the registry (e.g. logging outside `runWithContextAsync` or after teardown), the logger uses a **transient empty state** for that call only (never stored). That way one request never overwrites another’s context.
-
-Use `processingLogger.logInfo`, `logWarn`, `logError`, `logProgress`, etc. inside the callback so logs include the same context and are searchable by `fileUploadId` / filename.
-
-## Development
-
-### Patch Versions
-
-When making changes to the `oht-custom-parser-lib`, you need to update the version number before publishing. Follow these steps:
-
-1. **Update the version number**: Use npm's version command to bump the version:
-    - **Patch** for bug fixes:
-      ```bash
-      npm version patch
-      ```
-    - **Minor** for new features:
-      ```bash
-      npm version minor
-      ```
-    - **Major** for breaking changes:
-      ```bash
-      npm version major
-      ```
-
-   This command will automatically update the version in the `package.json` and create a git tag.
-
-2. **Commit Changes**: Ensure your changes and the version bump are committed to the repository.
-
-### Publish to npm Registry
-
-After updating the version, you can publish the library to the npm registry:
-
-1. **Login to npm** (if you haven't already):
-   ```bash
-   npm login
-   ```
-
-2. **Publish the package**:
-   ```bash
-   npm publish
-   ```
-
-   If this is a private package, use:
-   ```bash
-   npm publish --access restricted
-   ```
-
-3. **Verify the publish**: You can check the package on [npmjs.com](https://www.npmjs.com/) to verify that the new version is available.
-
-## Using the Library in Cloud Functions
-
-To use `oht-custom-parser-lib` in your cloud functions:
-
-1. **Install the Library**: Add `oht-custom-parser-lib` as a dependency in the cloud function's `package.json`:
-
-   ```json
-   {
-     "dependencies": {
-       "oht-custom-parser-lib": "^1.0.0"
-     }
-   }
-   ```
-
-   Replace `^1.0.0` with the appropriate version as needed.
-
-2. **Install Dependencies**: Run `npm install` to install the library along with other dependencies.
-
-3. **Deploy Your Function**: Deploy your cloud function as usual, ensuring that the updated dependencies are included.
+# oht-custom-parser-lib
+
+`oht-custom-parser-lib` is a shared library designed for use across multiple Node.js cloud functions. It contains common MongoDB connectors and data utilities that can be reused to avoid code duplication and ensure consistency.
+
+## Table of Contents
+
+- [Installation](#installation)
+- [Usage](#usage)
+- [Development](#development)
+    - [Patch Versions](#patch-versions)
+    - [Publish to npm Registry](#publish-to-npm-registry)
+- [Using the Library in Cloud Functions](#using-the-library-in-cloud-functions)
+
+## Installation
+
+To install `oht-custom-parser-lib`, you can add it as a dependency in your project using npm:
+
+```bash
+npm install oht-custom-parser-lib
+```
+
+Or, if you want to install a specific version:
+
+```bash
+npm install oht-custom-parser-lib@<version>
+```
+
+## Usage
+
+After installing, you can import and use the library in your cloud functions:
+
+```javascript
+const { connectToMongoDB } = require('oht-custom-parser-lib');
+```
+
+## Logging
+
+- **Production / GCP**: Logs are emitted as JSON (one line per log) for Cloud Logging.
+- **Local / development**: When `NODE_ENV !== 'production'`, logs are pretty-printed in the terminal (colors, timestamps, readable structure). You can override: `LOG_PRETTY=true` to force pretty output, or `LOG_PRETTY=false` to force JSON when not in production.
+
+### Processing logger: request-scoped state
+
+The processing logger (`processingLogger`, `runWithContextAsync`, `getRequestIdFromContext`) uses a **registry + facade** so each request has isolated state and logs never leak context between concurrent invocations (e.g. in Cloud Functions).
+
+- **Registry**: One `ProcessingState` per request, keyed by request id (`fileUploadId ?? messageId ?? cloudEventId ?? generatedId`). The same id is used for the whole request.
+- **AsyncLocalStorage**: Holds only the current request id; state is resolved via `registry.get(id)`.
+- **Entry point**: Wrap your handler in `runWithContextAsync(context, async () => { ... })`. The lib creates a registry entry, runs your callback with the id in AsyncLocalStorage, and removes the entry in a `finally` block.
+- **Clear-state rule**: If there is no request id or the id is not in the registry (e.g. logging outside `runWithContextAsync` or after teardown), the logger uses a **transient empty state** for that call only (never stored). That way one request never overwrites another’s context.
+
+Use `processingLogger.logInfo`, `logWarn`, `logError`, `logProgress`, etc. inside the callback so logs include the same context and are searchable by `fileUploadId` / filename.
+
+## Development
+
+### Patch Versions
+
+When making changes to the `oht-custom-parser-lib`, you need to update the version number before publishing. Follow these steps:
+
+1. **Update the version number**: Use npm's version command to bump the version:
+    - **Patch** for bug fixes:
+      ```bash
+      npm version patch
+      ```
+    - **Minor** for new features:
+      ```bash
+      npm version minor
+      ```
+    - **Major** for breaking changes:
+      ```bash
+      npm version major
+      ```
+
+   This command will automatically update the version in the `package.json` and create a git tag.
+
+2. **Commit Changes**: Ensure your changes and the version bump are committed to the repository.
+
+### Publish to npm Registry
+
+After updating the version, you can publish the library to the npm registry:
+
+1. **Login to npm** (if you haven't already):
+   ```bash
+   npm login
+   ```
+
+2. **Publish the package**:
+   ```bash
+   npm publish
+   ```
+
+   If this is a private package, use:
+   ```bash
+   npm publish --access restricted
+   ```
+
+3. **Verify the publish**: You can check the package on [npmjs.com](https://www.npmjs.com/) to verify that the new version is available.
+
+## Using the Library in Cloud Functions
+
+To use `oht-custom-parser-lib` in your cloud functions:
+
+1. **Install the Library**: Add `oht-custom-parser-lib` as a dependency in the cloud function's `package.json`:
+
+   ```json
+   {
+     "dependencies": {
+       "oht-custom-parser-lib": "^1.0.0"
+     }
+   }
+   ```
+
+   Replace `^1.0.0` with the appropriate version as needed.
+
+2. **Install Dependencies**: Run `npm install` to install the library along with other dependencies.
+
+3. **Deploy Your Function**: Deploy your cloud function as usual, ensuring that the updated dependencies are included.