@rulecad/variables 0.1.2 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rulecad/variables",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Design values you can trace: every number says where it comes from, and expressions are parsed, never run.",
   "type": "module",
   "exports": {

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,
@@ -119,7 +119,8 @@ export function resolve(object, { sets = {}, set = {}, display = {}, load } = {}
     busy.add(name);
     let src, where;
     if (name.includes('.')) {
-      const [s, r] = name.split('.');
+      let [s, r] = name.split('.');
+      if (!ruleSets[s] && ruleSets[s.replace(/_/g, '-')]) s = s.replace(/_/g, '-'); // pod_th.width reads the set named pod-th (a - is a minus here)
       if (!ruleSets[s]) throw new Error(`"${name}": rule set "${s}" isn't in uses (${Object.keys(ruleSets).join(', ') || 'none'})`);
       if (!ruleSets[s].rules[r]) throw new Error(`"${name}": no rule "${r}" in ${s}`);
       src = ruleSets[s].rules[r].value; where = (n) => (n.includes('.') ? n : `${s}.${n}`); // a rule's names are its own set's
@@ -146,6 +147,7 @@ export function resolve(object, { sets = {}, set = {}, display = {}, load } = {}
       values[s][r] = lookup(`${s}.${r}`);
       entries.push({ name: `${s}.${r}`, ...d, value: values[s][r], expr: typeof d.value === 'string' ? d.value : undefined, used: used.has(`${s}.${r}`) });
     }
+    if (rs.footprints) values[s].footprints = rs.footprints; // pad data for boards (v.esp32c6.footprints.module), as the set gives it
   }
   return { values, entries };
 }