@player-ui/player 0.10.0-next.3 → 0.10.0-next.5

package/package.json

@@ -6,12 +6,12 @@
     "types"
   ],
   "name": "@player-ui/player",
-  "version": "0.10.0-next.3",
+  "version": "0.10.0-next.5",
   "main": "dist/cjs/index.cjs",
   "dependencies": {
-    "@player-ui/partial-match-registry": "0.10.0-next.3",
-    "@player-ui/make-flow": "0.10.0-next.3",
-    "@player-ui/types": "0.10.0-next.3",
+    "@player-ui/partial-match-registry": "0.10.0-next.5",
+    "@player-ui/make-flow": "0.10.0-next.5",
+    "@player-ui/types": "0.10.0-next.5",
     "@types/dlv": "^1.1.4",
     "dequal": "^2.0.2",
     "dlv": "^1.1.3",

package/src/binding/__tests__/parser.bench.ts

@@ -0,0 +1,22 @@
+import { bench, describe } from "vitest";
+import get from "dlv";
+import { getBindingSegments } from "..";
+import { testCases, testModel } from "./resolver.test";
+import { parseCustom, ParserSuccessResult } from "../../binding-grammar";
+import { resolveBindingAST } from "../resolver";
+
+describe("parser benchmarks", () => {
+  testCases.map(
+    ([input, expectedOutput]) => {
+      bench(`Resolving binding: ${input}`, () => {
+        const parsedBinding = parseCustom(input);
+        resolveBindingAST((parsedBinding as ParserSuccessResult).path, {
+          getValue: (path) => get(testModel, getBindingSegments(path) as any),
+          convertToPath: (p) => p,
+          evaluate: () => undefined,
+        });
+      });
+    },
+    { iterations: 10000 },
+  );
+});

package/src/binding/__tests__/resolver.test.ts

@@ -5,7 +5,7 @@ import { parseCustom } from "../../binding-grammar";
 import { resolveBindingAST } from "../resolver";
 import { getBindingSegments } from "../utils";
 
-const testModel = {
+export const testModel = {
   foo: {
     pets: [
       {
@@ -23,11 +23,14 @@ const testModel = {
       "other",
     ],
   },
-};
+} as const;
 
-const testCases: Array<[string, string]> = [
+export const testCases: Array<[string, string]> = [
   ["foo.bar", "foo.bar"],
   ["foo.pets.1.name", "foo.pets.1.name"],
+  ["foo.pets.01.name", "foo.pets.1.name"],
+  ["foo.pets['01'].name", "foo.pets.01.name"],
+  ["foo.pets[01].name", "foo.pets.1.name"],
   ['foo.pets[name = "frodo"].type', "foo.pets.2.type"],
   ['foo.pets["name" = "sprinkles"].type', "foo.pets.4.type"],
 ];

package/src/binding-grammar/custom/index.ts

@@ -82,7 +82,7 @@ export const parse: Parser = (path) => {
       return;
     }
 
-    let value = ch;
+    let value: string | number = ch;
 
     while (next()) {
       if (!isIdentifierChar(ch)) {
@@ -93,6 +93,8 @@ export const parse: Parser = (path) => {
     }
 
     if (value) {
+      const maybeNumber = Number(value);
+      value = isNaN(maybeNumber) ? value : maybeNumber;
       return toValue(value);
     }
   };
@@ -260,6 +262,14 @@ export const parse: Parser = (path) => {
 
       let bracketSegment = parseBracket();
 
+      if (bracketSegment?.name === "Value") {
+        const maybeNumber = Number(bracketSegment.value);
+        bracketSegment.value =
+          isNaN(maybeNumber) || String(maybeNumber) !== bracketSegment.value
+            ? bracketSegment.value
+            : maybeNumber;
+      }
+
       while (bracketSegment !== undefined) {
         parsed.push(bracketSegment);
         bracketSegment = parseBracket();