@dallaylaen/ski-interpreter 2.8.1 → 2.9.0

package/lib/ski-interpreter.mjs

@@ -1686,6 +1686,8 @@ var Quest = class {
     this.intro = list2str(options.intro);
     this.id = options.id;
     this.meta = meta;
+    if (meta.created_at)
+      this.created = new Date(meta.created_at);
     for (const c of cases ?? [])
       this.add(...c);
   }
@@ -1833,10 +1835,9 @@ var Quest = class {
         findings[field] = found;
     }
     if (options.date) {
-      const date = new Date(this.meta?.created_at);
-      if (isNaN(date.getTime()))
+      if (!this.created || isNaN(this.created.getTime()))
         findings.date = "invalid date format: " + this.meta?.created_at;
-      else if (date.getTime() < (/* @__PURE__ */ new Date("2024-07-15")).getTime() || date.getTime() > (/* @__PURE__ */ new Date()).getTime())
+      else if (this.created < /* @__PURE__ */ new Date("2024-07-15") || this.created > /* @__PURE__ */ new Date())
         findings.date = "date out of range: " + this.meta?.created_at;
     }
     return findings;
@@ -2130,7 +2131,7 @@ function deepFormat(obj, options = {}) {
     out[key] = deepFormat(obj[key], options);
   return out;
 }
-function search(seed, options, predicate) {
+function* search(seed, options, predicate) {
   const {
     depth = 16,
     infer = true,
@@ -2141,57 +2142,70 @@ function search(seed, options, predicate) {
   let total = 0;
   let probed = 0;
   const seen = {};
+  const parseResult = (raw) => {
+    if (raw === null || raw === void 0)
+      return {};
+    if (typeof raw === "number")
+      return raw > 0 ? { found: true, stop: true } : raw < 0 ? { offset: -1 } : {};
+    return raw;
+  };
   const maybeProbe = (term) => {
     total++;
     const props = infer ? term.infer({ max: options.max, maxArgs: options.maxArgs }) : null;
     if (hasSeen && props && props.expr) {
       const key = String(props.expr);
       if (seen[key])
-        return { res: -1, props };
+        return { res: { offset: -1 }, props };
       seen[key] = true;
     }
     probed++;
-    const res = predicate(term, props);
+    const res = parseResult(predicate(term, props));
     return { res, props };
   };
   for (const term of seed) {
-    const { res = 0 } = maybeProbe(term);
-    if (res > 0)
-      return { expr: term, total, probed, gen: 1 };
-    else if (res < 0)
-      continue;
-    cache[0].push(term);
+    const { res } = maybeProbe(term);
+    if (res.found)
+      yield { expr: term, found: true, step: false, gen: 0, total, probed, cache };
+    if (res.stop)
+      return;
+    if ((res.offset ?? 0) >= 0)
+      cache[0].push(term);
   }
   let lastProgress = 0;
   for (let gen = 1; gen < depth; gen++) {
-    if (options.progress) {
-      options.progress({ gen, total, probed, step: true });
-      lastProgress = total;
-    }
+    yield { found: false, step: true, gen, total, probed, cache };
+    lastProgress = total;
     for (let i = 0; i < gen; i++) {
       for (const a of cache[gen - i - 1] || []) {
         for (const b of cache[i] || []) {
-          if (total >= (options.tries ?? Infinity))
-            return { total, probed, gen, ...options.retain ? { cache } : {} };
-          if (options.progress && total - lastProgress >= progressInterval) {
-            options.progress({ gen, total, probed, step: false });
+          if (total >= (options.tries ?? Infinity)) {
+            yield { found: false, step: false, gen, total, probed, cache };
+            return;
+          }
+          if (total - lastProgress >= progressInterval) {
+            yield { found: false, step: false, gen, total, probed, cache };
             lastProgress = total;
           }
           const term = a.apply(b);
           const { res, props } = maybeProbe(term);
-          if ((res ?? 0) > 0)
-            return { expr: term, total, probed, gen, ...options.retain ? { cache } : {} };
-          else if ((res ?? 0) < 0)
+          if (res.found)
+            yield { expr: term, found: true, step: false, gen, total, probed, cache };
+          if (res.stop) {
+            yield { found: false, step: false, gen, total, probed, cache };
+            return;
+          }
+          if ((res.offset ?? 0) < 0)
             continue;
-          const offset = infer && props ? (props.expr ? 0 : 3) + (props.dup ? 1 : 0) + (props.proper ? 0 : 1) : 0;
-          if (!cache[gen + offset])
-            cache[gen + offset] = [];
-          cache[gen + offset].push(term);
+          const autoOffset = infer && props ? (props.expr ? 0 : 3) + (props.dup ? 1 : 0) + (props.proper ? 0 : 1) : 0;
+          const finalOffset = res.offset ?? autoOffset;
+          if (!cache[gen + finalOffset])
+            cache[gen + finalOffset] = [];
+          cache[gen + finalOffset].push(term);
         }
       }
     }
   }
-  return { total, probed, gen: depth, ...options.retain ? { cache } : {} };
+  yield { found: false, step: false, gen: depth, total, probed, cache };
 }
 function isStringPair(x) {
   return Array.isArray(x) && x.length === 2 && typeof x[0] === "string" && typeof x[1] === "string" ? void 0 : "must be a pair of strings";