veryfront 0.1.1118 → 0.1.1119

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "veryfront",
-    "version": "0.1.1118",
+    "version": "0.1.1119",
     "license": "Apache-2.0",
     "nodeModulesDir": "auto",
     "minimumDependencyAge": {

package/esm/src/eval/metrics.d.ts

@@ -27,7 +27,7 @@ export declare const metrics: {
             pattern: string;
             flags?: string;
         }) => EvalMetric;
-        readonly jsonMatch: (options: {
+        readonly jsonMatch: (options?: {
             expected?: unknown;
         }) => EvalMetric;
         readonly groundedness: (options?: EvalAnswerGroundednessMetricOptions) => EvalMetric;

package/esm/src/eval/metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../src/src/eval/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mCAAmC,EACnC,kCAAkC,EAElC,6BAA6B,EAC7B,mCAAmC,EACnC,UAAU,EAMV,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,YAAY,CAAC;AA8BpB,KAAK,gBAAgB,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE;QACd,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,OAAO,CAAC;QACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAChC,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACnC,KAAK,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACxE,CAAC;AA2DF,iBAAS,aAAa,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAQ9C;AASD,iBAAS,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAE/C;AA8iBD,0FAA0F;AAC1F,eAAO,MAAM,OAAO;;mCAEF,UAAU;qCAON;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,aAAa,CAAC,EAAE,OAAO,CAAA;SAAE,KAAG,UAAU;kCAWzD;YAAE,OAAO,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAA;SAAE,KAAG,UAAU;sCAY5C;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;SAAE,KAAG,UAAU;0CAShC,mCAAmC,KAAQ,UAAU;;;sCAgD1D,UAAU;oCAgBV,MAAM,YAAY,wBAAwB,KAAG,UAAU;uCAcpD,MAAM,KAAG,UAAU;uCAcnB,MAAM,WAAW,wBAAwB,KAAG,UAAU;;;sCAgBvD,mCAAmC,KAAG,UAAU;yCAoC7C,mCAAmC,KAAG,UAAU;gCAuCzD,6BAA6B,KAAG,UAAU;+CA0C5B,kCAAkC,KAAQ,UAAU;4CA0CvD,kCAAkC,KAAQ,UAAU;;;oCAuD3D;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,KAAG,UAAU;mCAc/B;YAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;YAAC,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE,KAAG,UAAU;iCAoB3E;YAAE,MAAM,EAAE,MAAM,CAAA;SAAE,KAAG,UAAU;;;mCAsB7B,gBAAgB,KAAG,UAAU;;CAmCvC,CAAC;AAEX,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,CAAC"}
+{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../src/src/eval/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mCAAmC,EACnC,kCAAkC,EAElC,6BAA6B,EAC7B,mCAAmC,EACnC,UAAU,EAMV,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,YAAY,CAAC;AA8BpB,KAAK,gBAAgB,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE;QACd,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,OAAO,CAAC;QACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAChC,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACnC,KAAK,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACxE,CAAC;AA2DF,iBAAS,aAAa,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAQ9C;AAuBD,iBAAS,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAE/C;AA8iBD,0FAA0F;AAC1F,eAAO,MAAM,OAAO;;mCAEF,UAAU;qCAON;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,aAAa,CAAC,EAAE,OAAO,CAAA;SAAE,KAAG,UAAU;kCAWzD;YAAE,OAAO,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAA;SAAE,KAAG,UAAU;uCAY5C;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;SAAE,KAAQ,UAAU;0CAgBrC,mCAAmC,KAAQ,UAAU;;;sCAgD1D,UAAU;oCAgBV,MAAM,YAAY,wBAAwB,KAAG,UAAU;uCAcpD,MAAM,KAAG,UAAU;uCAcnB,MAAM,WAAW,wBAAwB,KAAG,UAAU;;;sCAgBvD,mCAAmC,KAAG,UAAU;yCAoC7C,mCAAmC,KAAG,UAAU;gCAuCzD,6BAA6B,KAAG,UAAU;+CA0C5B,kCAAkC,KAAQ,UAAU;4CA0CvD,kCAAkC,KAAQ,UAAU;;;oCAuD3D;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,KAAG,UAAU;mCAc/B;YAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;YAAC,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE,KAAG,UAAU;iCAoB3E;YAAE,MAAM,EAAE,MAAM,CAAA;SAAE,KAAG,UAAU;;;mCAsB7B,gBAAgB,KAAG,UAAU;;CAmCvC,CAAC;AAEX,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,CAAC"}

package/esm/src/eval/metrics.js

@@ -66,11 +66,25 @@ function getOutputText(output) {
     }
     return stableStringify(output);
 }
+const INVALID_JSON_TEXT = Symbol("invalid-json-text");
 function getOutputJson(output) {
-    if (output && typeof output === "object" && "json" in output) {
-        return output.json;
+    if (output && typeof output === "object") {
+        const record = output;
+        if (Object.hasOwn(record, "json"))
+            return { fromText: false, value: record.json };
+        if (Object.hasOwn(record, "text") && typeof record.text === "string") {
+            return { fromText: true, value: parseJsonText(record.text) };
+        }
+    }
+    return { fromText: false, value: output };
+}
+function parseJsonText(text) {
+    try {
+        return JSON.parse(text);
+    }
+    catch {
+        return INVALID_JSON_TEXT;
     }
-    return output;
 }
 function stableStringify(value) {
     return JSON.stringify(sortJsonValue(value));
@@ -80,7 +94,7 @@ function sortJsonValue(value) {
         return value.map(sortJsonValue);
     if (!value || typeof value !== "object")
         return value;
-    const sorted = {};
+    const sorted = Object.create(null);
     for (const key of Object.keys(value).sort()) {
         sorted[key] = sortJsonValue(value[key]);
     }
@@ -544,11 +558,19 @@ export const metrics = {
                 return scoreResult("answer.regex", "answer", "gate", pattern.test(getOutputText(record.output)));
             }, options);
         },
-        jsonMatch(options) {
+        jsonMatch(options = {}) {
             return createMetric("answer.jsonMatch", "answer", (record) => {
-                const expected = Object.hasOwn(options, "expected") ? options.expected : record.reference;
+                const hasExpectedOption = Object.hasOwn(options, "expected");
+                const expectedInput = hasExpectedOption ? options.expected : record.reference;
                 const actual = getOutputJson(record.output);
-                const pass = stableStringify(actual) === stableStringify(expected);
+                let expected = expectedInput;
+                if (actual.fromText && !hasExpectedOption && typeof expectedInput === "string") {
+                    const parsedReference = parseJsonText(expectedInput);
+                    if (parsedReference !== INVALID_JSON_TEXT)
+                        expected = parsedReference;
+                }
+                const pass = actual.value !== INVALID_JSON_TEXT && expected !== INVALID_JSON_TEXT &&
+                    stableStringify(actual.value) === stableStringify(expected);
                 return scoreResult("answer.jsonMatch", "answer", "gate", pass);
             }, options);
         },

package/esm/src/utils/version-constant.d.ts

@@ -1,3 +1,3 @@
 /** Shared version value. */
-export declare const VERSION = "0.1.1118";
+export declare const VERSION = "0.1.1119";
 //# sourceMappingURL=version-constant.d.ts.map

package/esm/src/utils/version-constant.js

@@ -1,4 +1,4 @@
 // Keep in sync with deno.json version.
 // scripts/release.ts updates this constant during releases.
 /** Shared version value. */
-export const VERSION = "0.1.1118";
+export const VERSION = "0.1.1119";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "veryfront",
-  "version": "0.1.1118",
+  "version": "0.1.1119",
   "description": "The simplest way to build AI-powered apps",
   "keywords": [
     "react",
@@ -332,10 +332,10 @@
     "@types/react": "19.2.14",
     "@types/react-dom": "19.2.3",
     "ws": "8.21.0",
-    "@veryfront/ext-bundler-esbuild": "0.1.1118",
-    "@veryfront/ext-content-mdx": "0.1.1118",
-    "@veryfront/ext-css-tailwind": "0.1.1118",
-    "@veryfront/ext-parser-babel": "0.1.1118"
+    "@veryfront/ext-bundler-esbuild": "0.1.1119",
+    "@veryfront/ext-content-mdx": "0.1.1119",
+    "@veryfront/ext-css-tailwind": "0.1.1119",
+    "@veryfront/ext-parser-babel": "0.1.1119"
   },
   "devDependencies": {
     "@types/node": "20.9.0"