@teselagen/ui 0.3.63 → 0.3.64

package/index.cjs.js

@@ -60452,15 +60452,29 @@ function matchSchemas(_0) {
     };
     let csvValidationIssue = false;
     const fuse = new Fuse(userSchema.fields, options);
+    const matchedAltPaths = [];
     officialSchema.fields.forEach((h2) => {
       let hasMatch = false;
       let result = fuse.search(h2.path) || [];
+      const hadNormalPathMatch = userSchema.fields.some((uh) => norm(uh.path) === norm(h2.path));
       userSchema.fields.forEach((uh, i) => {
         const pathMatch = norm(uh.path) === norm(h2.path);
         const displayNameMatch = h2.displayName && norm(uh.path) === norm(getTextFromEl(h2.displayName));
-        const hasAlternatePathMatch = h2.alternatePathMatch && (lodashExports.isArray(h2.alternatePathMatch) ? h2.alternatePathMatch : [h2.alternatePathMatch]).some((alternatePathMatch) => {
-          return norm(uh.path) === norm(alternatePathMatch);
+        const hasAlternatePathMatch = !hadNormalPathMatch && h2.alternatePathMatch && (lodashExports.isArray(h2.alternatePathMatch) ? h2.alternatePathMatch : [h2.alternatePathMatch]).find((alternatePathMatch) => {
+          let altPath = alternatePathMatch;
+          if (lodashExports.isPlainObject(alternatePathMatch)) {
+            altPath = alternatePathMatch.path;
+          }
+          return norm(uh.path) === norm(altPath);
         });
+        if (hasAlternatePathMatch) {
+          matchedAltPaths.push(
+            hasAlternatePathMatch.path || hasAlternatePathMatch
+          );
+          if (hasAlternatePathMatch.format) {
+            h2.format = hasAlternatePathMatch.format;
+          }
+        }
         if (pathMatch || displayNameMatch || hasAlternatePathMatch) {
           result = result.filter(({ path: path2 }) => path2 === uh.path);
           result.unshift({

package/index.es.js

@@ -60434,15 +60434,29 @@ function matchSchemas(_0) {
     };
     let csvValidationIssue = false;
     const fuse = new Fuse(userSchema.fields, options);
+    const matchedAltPaths = [];
     officialSchema.fields.forEach((h2) => {
       let hasMatch = false;
       let result = fuse.search(h2.path) || [];
+      const hadNormalPathMatch = userSchema.fields.some((uh) => norm(uh.path) === norm(h2.path));
       userSchema.fields.forEach((uh, i) => {
         const pathMatch = norm(uh.path) === norm(h2.path);
         const displayNameMatch = h2.displayName && norm(uh.path) === norm(getTextFromEl(h2.displayName));
-        const hasAlternatePathMatch = h2.alternatePathMatch && (lodashExports.isArray(h2.alternatePathMatch) ? h2.alternatePathMatch : [h2.alternatePathMatch]).some((alternatePathMatch) => {
-          return norm(uh.path) === norm(alternatePathMatch);
+        const hasAlternatePathMatch = !hadNormalPathMatch && h2.alternatePathMatch && (lodashExports.isArray(h2.alternatePathMatch) ? h2.alternatePathMatch : [h2.alternatePathMatch]).find((alternatePathMatch) => {
+          let altPath = alternatePathMatch;
+          if (lodashExports.isPlainObject(alternatePathMatch)) {
+            altPath = alternatePathMatch.path;
+          }
+          return norm(uh.path) === norm(altPath);
         });
+        if (hasAlternatePathMatch) {
+          matchedAltPaths.push(
+            hasAlternatePathMatch.path || hasAlternatePathMatch
+          );
+          if (hasAlternatePathMatch.format) {
+            h2.format = hasAlternatePathMatch.format;
+          }
+        }
         if (pathMatch || displayNameMatch || hasAlternatePathMatch) {
           result = result.filter(({ path: path2 }) => path2 === uh.path);
           result.unshift({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teselagen/ui",
-  "version": "0.3.63",
+  "version": "0.3.64",
   "main": "./src/index.js",
   "exports": {
     ".": {
@@ -10,7 +10,7 @@
     "./style.css": "./style.css"
   },
   "dependencies": {
-    "@teselagen/file-utils": "0.3.14",
+    "@teselagen/file-utils": "0.3.15",
     "@teselagen/bounce-loader": "0.3.11",
     "@blueprintjs/core": "3.52.0",
     "@blueprintjs/datetime": "3.23.19",

package/src/FormComponents/tryToMatchSchemas.js

@@ -1,4 +1,4 @@
-import { forEach, isArray, map, snakeCase } from "lodash";
+import { forEach, isArray, isPlainObject, map, snakeCase } from "lodash";
 import { nanoid } from "nanoid";
 import Fuse from "fuse.js";
 import { editCellHelper } from "../DataTable/editCellHelper";
@@ -82,25 +82,40 @@ async function matchSchemas({ userSchema, officialSchema }) {
   let csvValidationIssue = false;
   const fuse = new Fuse(userSchema.fields, options);
 
+  const matchedAltPaths = [];
   officialSchema.fields.forEach(h => {
     let hasMatch = false;
     //run fuse search for results
     let result = fuse.search(h.path) || [];
 
+    const hadNormalPathMatch = userSchema.fields.some(uh => norm(uh.path) === norm(h.path))
     //if there are any exact matches, push them onto the results array
     userSchema.fields.forEach((uh, i) => {
       const pathMatch = norm(uh.path) === norm(h.path);
       const displayNameMatch =
         h.displayName && norm(uh.path) === norm(getTextFromEl(h.displayName));
       const hasAlternatePathMatch =
+        !hadNormalPathMatch &&
         h.alternatePathMatch &&
         (isArray(h.alternatePathMatch)
           ? h.alternatePathMatch
           : [h.alternatePathMatch]
-        ).some(alternatePathMatch => {
-          return norm(uh.path) === norm(alternatePathMatch);
+        ).find(alternatePathMatch => {
+          let altPath = alternatePathMatch;
+          if (isPlainObject(alternatePathMatch)) {
+            altPath = alternatePathMatch.path;
+          }
+          return norm(uh.path) === norm(altPath);
         });
 
+      if (hasAlternatePathMatch) {
+        matchedAltPaths.push(
+          hasAlternatePathMatch.path || hasAlternatePathMatch
+        );
+        if (hasAlternatePathMatch.format) {
+          h.format = hasAlternatePathMatch.format;
+        }
+      }
       if (pathMatch || displayNameMatch || hasAlternatePathMatch) {
         result = result.filter(({ path }) => path === uh.path);
         //add a fake perfect match result to make sure we get the match