@patterkit/core 0.7.0 → 0.7.1

package/dist/index.cjs

@@ -96,6 +96,7 @@ ${indent}}`;
 var import_model = require("@patterkit/model");
 var import_model2 = require("@patterkit/model");
 var import_model3 = require("@patterkit/model");
+var import_expr = require("@wildwinter/expr");
 function choiceLoopsBack(choice, ...targets) {
   const back = new Set(targets.filter((s) => typeof s === "string" && s.length > 0));
   const hits = (n) => n.type === "snippet" ? !!n.jump && back.has(n.jump.to) : (n.children ?? []).some(hits);
@@ -601,18 +602,21 @@ function checkDecls(decls, where, issues) {
       });
     }
     if (decl.type === "quality") {
-      const stages = decl.stages ?? [];
-      if (stages.length < 2) {
-        issues.push({
-          code: "invalid-declaration",
-          message: `${where}: '${decl.name}' is a quality but declares ${stages.length === 0 ? "no stages" : "only one stage"} (a ladder needs at least two)`
-        });
-      }
-      const seenStages = /* @__PURE__ */ new Set();
-      for (const s of stages) {
-        if (!s.trim()) issues.push({ code: "invalid-declaration", message: `${where}: '${decl.name}' has an empty stage name` });
-        else if (seenStages.has(s)) issues.push({ code: "invalid-declaration", message: `${where}: '${decl.name}' declares stage '${s}' more than once` });
-        else seenStages.add(s);
+      for (const problem2 of (0, import_expr.qualityDeclarationProblems)(decl.stages)) {
+        switch (problem2.kind) {
+          case "too-few-stages":
+            issues.push({
+              code: "invalid-declaration",
+              message: `${where}: '${decl.name}' is a quality but declares ${problem2.count === 0 ? "no stages" : "only one stage"} (a ladder needs at least two)`
+            });
+            break;
+          case "empty-stage":
+            issues.push({ code: "invalid-declaration", message: `${where}: '${decl.name}' has an empty stage name` });
+            break;
+          case "duplicate-stage":
+            issues.push({ code: "invalid-declaration", message: `${where}: '${decl.name}' declares stage '${problem2.stage}' more than once` });
+            break;
+        }
       }
     }
     if (decl.default !== void 0 && !defaultMatchesType(decl.default, decl)) {
@@ -636,7 +640,7 @@ function defaultMatchesType(value, decl) {
     case "flags":
       return Array.isArray(value) && value.every((v) => typeof v === "string" && (decl.values?.includes(v) ?? true));
     case "quality":
-      return typeof value === "string" && (decl.stages?.includes(value) ?? true);
+      return typeof value === "string" && !(0, import_expr.qualityDeclarationProblems)(decl.stages, value).some((p) => p.kind === "default-not-a-stage");
   }
 }
 

package/dist/index.js

@@ -58,6 +58,7 @@ ${indent}}`;
 import { walkNodes, DEFAULT_WRITING_STATUSES, DEFAULT_RECORDING_STATUSES, DEFAULT_DOCUMENTATION_CLASSES, projectQualifiers, usedSpeakerPairs, PAD_AFTER_MIN, PAD_AFTER_MAX } from "@patterkit/model";
 import { isValidGameId, effectiveGameId } from "@patterkit/model";
 import { isValidPropertyName, propertyNameify, RESERVED_PROPERTY_NAMES } from "@patterkit/model";
+import { qualityDeclarationProblems } from "@wildwinter/expr";
 function choiceLoopsBack(choice, ...targets) {
   const back = new Set(targets.filter((s) => typeof s === "string" && s.length > 0));
   const hits = (n) => n.type === "snippet" ? !!n.jump && back.has(n.jump.to) : (n.children ?? []).some(hits);
@@ -563,18 +564,21 @@ function checkDecls(decls, where, issues) {
       });
     }
     if (decl.type === "quality") {
-      const stages = decl.stages ?? [];
-      if (stages.length < 2) {
-        issues.push({
-          code: "invalid-declaration",
-          message: `${where}: '${decl.name}' is a quality but declares ${stages.length === 0 ? "no stages" : "only one stage"} (a ladder needs at least two)`
-        });
-      }
-      const seenStages = /* @__PURE__ */ new Set();
-      for (const s of stages) {
-        if (!s.trim()) issues.push({ code: "invalid-declaration", message: `${where}: '${decl.name}' has an empty stage name` });
-        else if (seenStages.has(s)) issues.push({ code: "invalid-declaration", message: `${where}: '${decl.name}' declares stage '${s}' more than once` });
-        else seenStages.add(s);
+      for (const problem2 of qualityDeclarationProblems(decl.stages)) {
+        switch (problem2.kind) {
+          case "too-few-stages":
+            issues.push({
+              code: "invalid-declaration",
+              message: `${where}: '${decl.name}' is a quality but declares ${problem2.count === 0 ? "no stages" : "only one stage"} (a ladder needs at least two)`
+            });
+            break;
+          case "empty-stage":
+            issues.push({ code: "invalid-declaration", message: `${where}: '${decl.name}' has an empty stage name` });
+            break;
+          case "duplicate-stage":
+            issues.push({ code: "invalid-declaration", message: `${where}: '${decl.name}' declares stage '${problem2.stage}' more than once` });
+            break;
+        }
       }
     }
     if (decl.default !== void 0 && !defaultMatchesType(decl.default, decl)) {
@@ -598,7 +602,7 @@ function defaultMatchesType(value, decl) {
     case "flags":
       return Array.isArray(value) && value.every((v) => typeof v === "string" && (decl.values?.includes(v) ?? true));
     case "quality":
-      return typeof value === "string" && (decl.stages?.includes(value) ?? true);
+      return typeof value === "string" && !qualityDeclarationProblems(decl.stages, value).some((p) => p.kind === "default-not-a-stage");
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patterkit/core",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Patter core: stable id generation, readable-handle computation, canonical (de)serialisation, and the structural validator.",
   "type": "module",
   "license": "MIT",
@@ -35,6 +35,7 @@
   },
   "dependencies": {
     "@patterkit/model": "0.14.0",
+    "@wildwinter/expr": "^0.5.2",
     "@wildwinter/toolkit": "^0.1.0",
     "json5": "^2.2.3"
   }