@rulecad/variables 0.1.1 → 0.1.3

package/README.md

@@ -3,7 +3,7 @@
 Design values you can trace. Every measurement is a variable, and every variable can say where it comes from: a
 printer's spec, a standard, a community figure, or something you measured (`kind`: spec, community, measured or
 estimate, with its `source`). Expressions are parsed, never `eval`'d, so a JSON file can't run code. No dependencies;
-browsers and Node 18+.
+browsers and Node 20+.
 
 ```js
 import { resolve } from '@rulecad/variables';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rulecad/variables",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Design values you can trace: every number says where it comes from, and expressions are parsed, never run.",
   "type": "module",
   "exports": {
@@ -22,7 +22,7 @@
     "provenance"
   ],
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "sideEffects": false,
   "repository": {

package/variables.d.mts

@@ -1,4 +1,4 @@
-export function checkName(name: any, d: any, v: any): string;
+export function checkName(name: any, d: any, v: any): string | number;
 /**
  * One expression: + - * / and brackets, min, max, round, sind, cosd, tand, over numbers and names. Never runs code.
  * @param {string | number} src

package/variables.mjs

@@ -17,10 +17,10 @@ export const ANCHORS = ['tl', 'tc', 'tr', 'ml', 'mc', 'mr', 'bl', 'bc', 'br'];
 export const isName = (d) => !!(d.choice || ['text', 'anchor', 'layout'].includes(d.type));
 export const options = (d) => (d.type === 'anchor' ? ANCHORS : d.type === 'text' ? null : d.choice);
 export function checkName(name, d, v) {
-  const s = String(v), opts = options(d);
-  if (opts && !opts.includes(s)) throw new Error(`${name} is one of ${opts.join(', ')} (got "${s}")`);
+  const s = String(v), opts = options(d), match = opts?.find((o) => String(o) === s);
+  if (opts && match === undefined) throw new Error(`${name} is one of ${opts.join(', ')} (got "${s}")`);
   if (!opts && s.length > (d.max ?? 16)) throw new Error(`${name} is at most ${d.max ?? 16} characters`);
-  return s;
+  return typeof match === 'number' ? match : s; // choices can be numbers too (a rotation: 0, 90, 180, 270)
 }
 const DEG = Math.PI / 180;
 const FNS = { min: Math.min, max: Math.max, round: (x, step = 1) => Math.round(x / step) * step,