@finsys/core 2.3.0 → 2.3.1

package/dist/index.cjs

@@ -9574,9 +9574,12 @@ function processIhsDetails(ihsData) {
   const specs = getBaseFieldSpecs();
   const fileColumnSet = /* @__PURE__ */ new Set();
   for (const field of specs) {
-    if (field.type === "file" && field.ihs_column_names) {
-      for (const col of field.ihs_column_names) {
-        fileColumnSet.add(col);
+    if (field.type === "file") {
+      if (field.name) fileColumnSet.add(field.name);
+      if (field.ihs_column_names) {
+        for (const col of field.ihs_column_names) {
+          fileColumnSet.add(col);
+        }
       }
     }
   }
@@ -9678,59 +9681,45 @@ function isPopulated(value) {
   if (value === "Not Specified") return false;
   return true;
 }
-function hasUploadedFile(fields, ihsRecord) {
-  return fields.some((field) => {
-    if (!field.name) return false;
-    return isPopulated(ihsRecord[field.name]);
-  });
-}
-function getExtractionColumns(fields) {
-  const columns = [];
-  for (const field of fields) {
-    if (field.ihs_column_names) {
-      columns.push(...field.ihs_column_names);
+function countUploadedFiles(ihsRecord, aggregateKey) {
+  const raw = ihsRecord[aggregateKey];
+  if (!raw) return 0;
+  if (typeof raw === "string") {
+    try {
+      const parsed = JSON.parse(raw);
+      if (Array.isArray(parsed)) return parsed.length;
+    } catch {
+      return 1;
     }
   }
-  return columns;
+  if (Array.isArray(raw)) return raw.length;
+  return 1;
 }
 function getPopulatedColumns(columns, ihsRecord) {
   return columns.filter((col) => isPopulated(ihsRecord[col]));
 }
-function resolveExtractionStatus(ihsRecord, jobRecords) {
-  const documents = [];
-  for (const fileType of Object.values(ExtractionFileType)) {
-    const groupName = FILE_TYPE_TO_GROUP[fileType];
-    const fields = _grouped[groupName] ?? [];
-    const displayName = _groupDisplayNames[groupName] ?? fileType;
-    const uploaded = fields.length > 0 && hasUploadedFile(fields, ihsRecord);
-    const allColumns = getExtractionColumns(fields);
-    const populated = getPopulatedColumns(allColumns, ihsRecord);
-    const hasExtractedData = populated.length > 0;
-    let status;
-    let errorMessage;
-    if (!uploaded) {
-      status = "not_uploaded" /* NotUploaded */;
-    } else if (jobRecords) {
-      const job = jobRecords.find((j) => j.fileType === fileType);
-      if (job) {
-        if (job.status === "queued" /* Queued */) {
-          status = "queued" /* Queued */;
-        } else if (job.status === "processing" /* Processing */) {
-          status = "processing" /* Processing */;
-        } else if (job.status === "failed" /* Failed */) {
-          if (hasExtractedData) {
-            status = "extracted" /* Extracted */;
-            errorMessage = job.errorMessage;
-          } else {
-            status = "failed" /* Failed */;
-            errorMessage = job.errorMessage;
-          }
-        } else if (job.status === "succeeded" /* Succeeded */ || hasExtractedData) {
+function resolveDocStatus(columns, ihsRecord, uploaded, jobRecord, hasJobRecords) {
+  const populated = getPopulatedColumns(columns, ihsRecord);
+  const hasExtractedData = populated.length > 0;
+  let status;
+  let errorMessage;
+  if (!uploaded) {
+    status = "not_uploaded" /* NotUploaded */;
+  } else if (hasJobRecords) {
+    if (jobRecord) {
+      if (jobRecord.status === "queued" /* Queued */) {
+        status = "queued" /* Queued */;
+      } else if (jobRecord.status === "processing" /* Processing */) {
+        status = "processing" /* Processing */;
+      } else if (jobRecord.status === "failed" /* Failed */) {
+        if (hasExtractedData) {
           status = "extracted" /* Extracted */;
+          errorMessage = jobRecord.errorMessage;
         } else {
-          status = "uploaded" /* Uploaded */;
+          status = "failed" /* Failed */;
+          errorMessage = jobRecord.errorMessage;
         }
-      } else if (hasExtractedData) {
+      } else if (jobRecord.status === "succeeded" /* Succeeded */ || hasExtractedData) {
         status = "extracted" /* Extracted */;
       } else {
         status = "uploaded" /* Uploaded */;
@@ -9738,16 +9727,68 @@ function resolveExtractionStatus(ihsRecord, jobRecords) {
     } else if (hasExtractedData) {
       status = "extracted" /* Extracted */;
     } else {
-      status = "unknown" /* Unknown */;
+      status = "uploaded" /* Uploaded */;
+    }
+  } else if (hasExtractedData) {
+    status = "extracted" /* Extracted */;
+  } else {
+    status = "unknown" /* Unknown */;
+  }
+  return { status, errorMessage };
+}
+function resolveExtractionStatus(ihsRecord, jobRecords) {
+  const documents = [];
+  const hasJobRecords = jobRecords !== void 0;
+  for (const fileType of Object.values(ExtractionFileType)) {
+    const groupName = FILE_TYPE_TO_GROUP[fileType];
+    const fields = _grouped[groupName] ?? [];
+    const displayName = _groupDisplayNames[groupName] ?? fileType;
+    const uploadedCount = countUploadedFiles(ihsRecord, fileType);
+    const isUploaded = uploadedCount > 0 || fields.some((f) => f.name && isPopulated(ihsRecord[f.name]));
+    const matchingJobs = jobRecords?.filter((j) => j.fileType === fileType) ?? [];
+    if (fields.length <= 1) {
+      const field = fields[0];
+      const columns = field?.ihs_column_names ?? [];
+      const populated = getPopulatedColumns(columns, ihsRecord);
+      const { status, errorMessage } = resolveDocStatus(
+        columns,
+        ihsRecord,
+        isUploaded,
+        matchingJobs[0],
+        hasJobRecords
+      );
+      documents.push({
+        fileType,
+        status,
+        displayName,
+        populatedColumns: populated,
+        totalColumns: columns.length,
+        errorMessage
+      });
+    } else {
+      const count = Math.max(uploadedCount, 1);
+      for (let idx = 0; idx < count; idx++) {
+        const field = fields[idx];
+        const columns = field?.ihs_column_names ?? [];
+        const populated = getPopulatedColumns(columns, ihsRecord);
+        const fileUploaded = idx < uploadedCount;
+        const { status, errorMessage } = resolveDocStatus(
+          columns,
+          ihsRecord,
+          fileUploaded,
+          matchingJobs[idx],
+          hasJobRecords
+        );
+        documents.push({
+          fileType,
+          status,
+          displayName,
+          populatedColumns: populated,
+          totalColumns: columns.length,
+          errorMessage
+        });
+      }
     }
-    documents.push({
-      fileType,
-      status,
-      displayName,
-      populatedColumns: populated,
-      totalColumns: allColumns.length,
-      errorMessage
-    });
   }
   const summary = documents.reduce(
     (acc, d) => {