@milehimikey/em 1.22.0 → 1.22.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (62) hide show
  1. package/.claude/skills/event-modeling/SKILL.md +1 -1
  2. package/.claude/skills/event-modeling-conform/SKILL.md +1 -1
  3. package/.claude/skills/event-modeling-design/SKILL.md +5 -2
  4. package/.claude/skills/event-modeling-discover/SKILL.md +1 -1
  5. package/.claude/skills/event-modeling-engagement/SKILL.md +1 -1
  6. package/.claude/skills/event-modeling-implement/SKILL.md +1 -1
  7. package/.claude/skills/event-modeling-review/SKILL.md +1 -1
  8. package/.claude/skills/event-modeling-shared/reference/em-dsl.md +36 -0
  9. package/.claude-plugin/marketplace.json +2 -2
  10. package/dist/cli/api.d.ts +60 -17
  11. package/dist/cli/api.js +154 -34
  12. package/dist/cli/api.js.map +1 -1
  13. package/dist/cli/scopeInputs.js +2 -2
  14. package/dist/cli/scopeInputs.js.map +1 -1
  15. package/dist/emit/api.d.ts +18 -0
  16. package/dist/emit/api.js +117 -3
  17. package/dist/emit/api.js.map +1 -1
  18. package/dist/emit/apiSurfaceJson.d.ts +1 -1
  19. package/dist/emit/apiSurfaceJson.js +18 -1
  20. package/dist/emit/apiSurfaceJson.js.map +1 -1
  21. package/dist/emit/diffJson.d.ts +1 -1
  22. package/dist/emit/diffJson.js +20 -1
  23. package/dist/emit/diffJson.js.map +1 -1
  24. package/dist/emit/json.d.ts +42 -1
  25. package/dist/emit/json.js +65 -6
  26. package/dist/emit/json.js.map +1 -1
  27. package/dist/mcp/server.js +7 -6
  28. package/dist/mcp/server.js.map +1 -1
  29. package/dist/model/diff.d.ts +19 -1
  30. package/dist/model/diff.js +99 -0
  31. package/dist/model/diff.js.map +1 -1
  32. package/dist/model/model.d.ts +88 -4
  33. package/dist/model/model.js +98 -3
  34. package/dist/model/model.js.map +1 -1
  35. package/dist/model/refs.d.ts +4 -0
  36. package/dist/model/refs.js +35 -1
  37. package/dist/model/refs.js.map +1 -1
  38. package/dist/model/rules.d.ts +61 -0
  39. package/dist/model/rules.js +72 -0
  40. package/dist/model/rules.js.map +1 -1
  41. package/dist/model/validate.js +137 -4
  42. package/dist/model/validate.js.map +1 -1
  43. package/dist/parser/ast.d.ts +30 -0
  44. package/dist/parser/parser.js +67 -1
  45. package/dist/parser/parser.js.map +1 -1
  46. package/dist/render/sliceDiagram.js +6 -0
  47. package/dist/render/sliceDiagram.js.map +1 -1
  48. package/dist/render/storylineDiagram.js +6 -0
  49. package/dist/render/storylineDiagram.js.map +1 -1
  50. package/dist/system/adaptation.d.ts +5 -2
  51. package/dist/system/adaptation.js +5 -3
  52. package/dist/system/adaptation.js.map +1 -1
  53. package/package.json +2 -1
  54. package/plugin/.claude-plugin/plugin.json +2 -2
  55. package/plugin/shared/reference/em-dsl.md +36 -0
  56. package/plugin/skills/conform/SKILL.md +1 -1
  57. package/plugin/skills/design/SKILL.md +5 -2
  58. package/plugin/skills/discover/SKILL.md +1 -1
  59. package/plugin/skills/engagement/SKILL.md +1 -1
  60. package/plugin/skills/event-modeling/SKILL.md +1 -1
  61. package/plugin/skills/implement/SKILL.md +1 -1
  62. package/plugin/skills/review/SKILL.md +1 -1
@@ -316,6 +316,66 @@ export const RULES = {
316
316
  usageCategory: "public field type unresolved",
317
317
  docAnchor: "strict-public-types",
318
318
  },
319
+ // GH #477: `scalar Name: base` declarations. Unlike `duplicate-type-name` (a warning — a
320
+ // declared type's references always resolve unambiguously to the first occurrence), these
321
+ // three are errors in the house style: a scalar is a wire-identity declaration, so a
322
+ // redeclaration, an unresolvable base, or a name that silently means two different things
323
+ // (a scalar here, a type there) is a contract defect, not a cosmetic duplicate.
324
+ "scalar-unknown-base": {
325
+ severity: "error",
326
+ title: "Scalar unknown base",
327
+ fix: "Point `base` at one of the public scalar table's names (string, text, int, long, decimal, boolean, uuid, date, datetime, duration, bytes), case-insensitive.",
328
+ usageCategory: "scalar unknown base",
329
+ docAnchor: "strict-public-types",
330
+ },
331
+ "scalar-duplicate-name": {
332
+ severity: "error",
333
+ title: "Scalar duplicate name",
334
+ fix: "Declare the scalar once; rename or remove the duplicate `scalar` line.",
335
+ usageCategory: "scalar duplicate name",
336
+ docAnchor: "strict-public-types",
337
+ },
338
+ "scalar-type-name-collision": {
339
+ severity: "error",
340
+ title: "Scalar/type name collision",
341
+ fix: "Rename the `scalar` or the `type` so the two names no longer collide — a name can't mean both at once.",
342
+ usageCategory: "scalar type name collision",
343
+ docAnchor: "strict-public-types",
344
+ },
345
+ // GH #478: `enum Name { member, … }` declarations. Same house-style posture as #477's
346
+ // scalar errors (above) — an enum is a wire-identity value set, so getting it wrong is a
347
+ // contract defect, not a cosmetic duplicate. `enum-duplicate-name` extends the scalar
348
+ // precedent (two declarations under one name silently picking first-wins is a worse defect
349
+ // for a value-set identity than it is for a `type`'s shape) even though the issue's own list
350
+ // named only three checks — see REPORT.md.
351
+ "enum-empty": {
352
+ severity: "error",
353
+ title: "Empty enum",
354
+ fix: "Give the enum at least one member, or remove the declaration.",
355
+ usageCategory: "enum empty",
356
+ docAnchor: "strict-public-types",
357
+ },
358
+ "enum-duplicate-member": {
359
+ severity: "error",
360
+ title: "Enum duplicate member",
361
+ fix: "Remove or rename the duplicate member — members are compared case-insensitively.",
362
+ usageCategory: "enum duplicate member",
363
+ docAnchor: "strict-public-types",
364
+ },
365
+ "enum-duplicate-name": {
366
+ severity: "error",
367
+ title: "Enum duplicate name",
368
+ fix: "Declare the enum once; rename or remove the duplicate `enum` block.",
369
+ usageCategory: "enum duplicate name",
370
+ docAnchor: "strict-public-types",
371
+ },
372
+ "enum-name-collision": {
373
+ severity: "error",
374
+ title: "Enum/type/scalar name collision",
375
+ fix: "Rename the `enum` or the colliding `type`/`scalar` so the names no longer collide — a name can't mean both at once.",
376
+ usageCategory: "enum name collision",
377
+ docAnchor: "strict-public-types",
378
+ },
319
379
  "lineage-ref-malformed": {
320
380
  severity: "error",
321
381
  title: "Malformed lineage ref",
@@ -518,6 +578,18 @@ export const RULES = {
518
578
  fix: "Rename the type so its export ref is unique.",
519
579
  usageCategory: "duplicate type ref",
520
580
  },
581
+ "duplicate-scalar-ref": {
582
+ severity: "warning",
583
+ title: "Duplicate scalar ref",
584
+ fix: "Rename the scalar so its export ref is unique.",
585
+ usageCategory: "duplicate scalar ref",
586
+ },
587
+ "duplicate-enum-ref": {
588
+ severity: "warning",
589
+ title: "Duplicate enum ref",
590
+ fix: "Rename the enum so its export ref is unique.",
591
+ usageCategory: "duplicate enum ref",
592
+ },
521
593
  // MIL-193: two models in one multi-model invocation whose model keys (kebab-slugged declared
522
594
  // names, model/qualifiedRef.ts) collide — the later one takes a `~n` suffix, exactly as
523
595
  // `duplicate-slice-name` handles a slice-key collision. Raised by computeModelKeys(), which
@@ -1 +1 @@
1
- {"version":3,"file":"rules.js","sourceRoot":"","sources":["../../src/model/rules.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rules.js","sourceRoot":"","sources":["../../src/model/rules.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,6FAA6F;AAC7F,+FAA+F;AAC/F,+FAA+F;AAC/F,gCAAgC;AAChC,EAAE;AACF,4FAA4F;AAC5F,4FAA4F;AAC5F,sFAAsF;AACtF,+FAA+F;AAC/F,6FAA6F;AAC7F,2FAA2F;AAC3F,wFAAwF;AACxF,uFAAuF;AACvF,EAAE;AACF,6FAA6F;AAC7F,iGAAiG;AACjG,2FAA2F;AAC3F,6BAA6B;AA8B7B,MAAM,CAAC,MAAM,KAAK,GAAG;IACnB,gBAAgB,EAAE;QAChB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,gBAAgB;QACvB,GAAG,EAAE,oDAAoD;QACzD,aAAa,EAAE,qBAAqB;KACrC;IACD,gCAAgC,EAAE;QAChC,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,gCAAgC;QACvC,GAAG,EAAE,4FAA4F;QACjG,aAAa,EAAE,gCAAgC;QAC/C,SAAS,EAAE,OAAO;QAClB,MAAM,EAAE,OAAO;KAChB;IACD,6BAA6B,EAAE;QAC7B,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,2CAA2C;QAClD,GAAG,EAAE,iIAAiI;QACtI,aAAa,EAAE,2BAA2B;QAC1C,SAAS,EAAE,OAAO;QAClB,MAAM,EAAE,OAAO;KAChB;IACD,gBAAgB,EAAE;QAChB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,oCAAoC;QAC3C,GAAG,EAAE,gLAAgL;QACrL,aAAa,EAAE,gCAAgC;QAC/C,SAAS,EAAE,OAAO;QAClB,MAAM,EAAE,OAAO;KAChB;IACD,+BAA+B,EAAE;QAC/B,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,sDAAsD;QAC7D,GAAG,EAAE,+LAA+L;QACpM,aAAa,EAAE,uCAAuC;QACtD,SAAS,EAAE,OAAO;QAClB,MAAM,EAAE,OAAO;KAChB;IACD,wBAAwB,EAAE;QACxB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,gEAAgE;QACvE,GAAG,EAAE,oMAAoM;QACzM,aAAa,EAAE,+BAA+B;QAC9C,SAAS,EAAE,OAAO;QAClB,MAAM,EAAE,OAAO;KAChB;IACD,oBAAoB,EAAE;QACpB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,sCAAsC;QAC7C,GAAG,EAAE,sPAAsP;QAC3P,aAAa,EAAE,4BAA4B;QAC3C,SAAS,EAAE,OAAO;QAClB,MAAM,EAAE,OAAO;KAChB;IACD,+BAA+B,EAAE;QAC/B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,sCAAsC;QAC7C,GAAG,EAAE,oFAAoF;QACzF,aAAa,EAAE,oCAAoC;KACpD;IACD,iCAAiC,EAAE;QACjC,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,mCAAmC;QAC1C,GAAG,EAAE,sEAAsE;QAC3E,aAAa,EAAE,+BAA+B;KAC/C;IACD,sCAAsC,EAAE;QACtC,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,uBAAuB;QAC9B,GAAG,EAAE,qCAAqC;QAC1C,aAAa,EAAE,2BAA2B;QAC1C,SAAS,EAAE,qBAAqB;KACjC;IACD,2BAA2B,EAAE;QAC3B,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,8CAA8C;QACrD,GAAG,EAAE,6OAA6O;QAClP,aAAa,EAAE,wCAAwC;QACvD,SAAS,EAAE,OAAO;QAClB,MAAM,EAAE,OAAO;KAChB;IACD,gBAAgB,EAAE;QAChB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,2BAA2B;QAClC,GAAG,EAAE,iEAAiE;QACtE,aAAa,EAAE,0BAA0B;KAC1C;IACD,sBAAsB,EAAE;QACtB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,sBAAsB;QAC7B,GAAG,EAAE,qDAAqD;QAC1D,aAAa,EAAE,+BAA+B;KAC/C;IACD,wBAAwB,EAAE;QACxB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,+CAA+C;QACtD,GAAG,EAAE,qDAAqD;QAC1D,aAAa,EAAE,mCAAmC;KACnD;IACD,0CAA0C,EAAE;QAC1C,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,2BAA2B;QAClC,GAAG,EAAE,8DAA8D;QACnE,aAAa,EAAE,sBAAsB;QACrC,SAAS,EAAE,qBAAqB;KACjC;IACD,2CAA2C,EAAE;QAC3C,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,gCAAgC;QACvC,GAAG,EAAE,yIAAyI;QAC9I,aAAa,EAAE,qCAAqC;QACpD,SAAS,EAAE,qBAAqB;KACjC;IACD,yBAAyB,EAAE;QACzB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,uCAAuC;QAC9C,GAAG,EAAE,sFAAsF;QAC3F,aAAa,EAAE,qCAAqC;QACpD,SAAS,EAAE,qBAAqB;KACjC;IACD,0BAA0B,EAAE;QAC1B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,2BAA2B;QAClC,GAAG,EAAE,mEAAmE;QACxE,aAAa,EAAE,wCAAwC;KACxD;IACD,2BAA2B,EAAE;QAC3B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,kDAAkD;QACzD,GAAG,EAAE,qDAAqD;QAC1D,aAAa,EAAE,sCAAsC;KACtD;IACD,yBAAyB,EAAE;QACzB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,+BAA+B;QACtC,GAAG,EAAE,kHAAkH;QACvH,aAAa,EAAE,yBAAyB;QACxC,SAAS,EAAE,YAAY;QACvB,MAAM,EAAE,OAAO;KAChB;IACD,yBAAyB,EAAE;QACzB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,oCAAoC;QAC3C,GAAG,EAAE,sEAAsE;QAC3E,aAAa,EAAE,yCAAyC;KACzD;IACD,uBAAuB,EAAE;QACvB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,yBAAyB;QAChC,GAAG,EAAE,8DAA8D;QACnE,aAAa,EAAE,uBAAuB;KACvC;IACD,8BAA8B,EAAE;QAC9B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,qEAAqE;QAC5E,GAAG,EAAE,yFAAyF;QAC9F,aAAa,EAAE,4CAA4C;KAC5D;IACD,4BAA4B,EAAE;QAC5B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,wCAAwC;QAC/C,GAAG,EAAE,qDAAqD;QAC1D,aAAa,EAAE,wCAAwC;KACxD;IACD,yCAAyC,EAAE;QACzC,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,yBAAyB;QAChC,GAAG,EAAE,gEAAgE;QACrE,aAAa,EAAE,0BAA0B;QACzC,SAAS,EAAE,qBAAqB;KACjC;IACD,yCAAyC,EAAE;QACzC,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,0BAA0B;QACjC,GAAG,EAAE,0EAA0E;QAC/E,aAAa,EAAE,8BAA8B;QAC7C,SAAS,EAAE,qBAAqB;KACjC;IACD,qCAAqC,EAAE;QACrC,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,6BAA6B;QACpC,GAAG,EAAE,iEAAiE;QACtE,aAAa,EAAE,4BAA4B;QAC3C,SAAS,EAAE,qBAAqB;KACjC;IACD,kCAAkC,EAAE;QAClC,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,oBAAoB;QAC3B,GAAG,EAAE,qDAAqD;QAC1D,aAAa,EAAE,kCAAkC;QACjD,SAAS,EAAE,qBAAqB;KACjC;IACD,sCAAsC,EAAE;QACtC,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,iCAAiC;QACxC,GAAG,EAAE,iEAAiE;QACtE,aAAa,EAAE,gCAAgC;QAC/C,SAAS,EAAE,qBAAqB;KACjC;IACD,iCAAiC,EAAE;QACjC,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,oCAAoC;QAC3C,GAAG,EAAE,uDAAuD;QAC5D,aAAa,EAAE,4BAA4B;QAC3C,SAAS,EAAE,qBAAqB;KACjC;IACD,gBAAgB,EAAE;QAChB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,gBAAgB;QACvB,GAAG,EAAE,wCAAwC;QAC7C,aAAa,EAAE,uBAAuB;KACvC;IACD,kBAAkB,EAAE;QAClB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,+CAA+C;QACtD,GAAG,EAAE,gGAAgG;QACrG,aAAa,EAAE,yBAAyB;KACzC;IACD,qBAAqB,EAAE;QACrB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,8BAA8B;QACrC,GAAG,EAAE,2DAA2D;QAChE,aAAa,EAAE,4BAA4B;KAC5C;IACD,kCAAkC,EAAE;QAClC,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,oBAAoB;QAC3B,GAAG,EAAE,yGAAyG;QAC9G,aAAa,EAAE,oBAAoB;QACnC,SAAS,EAAE,qBAAqB;KACjC;IACD,yBAAyB,EAAE;QACzB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,yBAAyB;QAChC,GAAG,EAAE,8BAA8B;QACnC,aAAa,EAAE,2BAA2B;KAC3C;IACD,yBAAyB,EAAE;QACzB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,yBAAyB;QAChC,GAAG,EAAE,8BAA8B;QACnC,aAAa,EAAE,2BAA2B;KAC3C;IACD,YAAY,EAAE;QACZ,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,YAAY;QACnB,GAAG,EAAE,uDAAuD;QAC5D,aAAa,EAAE,YAAY;KAC5B;IACD,gBAAgB,EAAE;QAChB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,gBAAgB;QACvB,GAAG,EAAE,+BAA+B;QACpC,aAAa,EAAE,2BAA2B;KAC3C;IACD,6BAA6B,EAAE;QAC7B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,6DAA6D;QACpE,GAAG,EAAE,2GAA2G;QAChH,aAAa,EAAE,6BAA6B;KAC7C;IACD,4BAA4B,EAAE;QAC5B,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,iDAAiD;QACxD,GAAG,EAAE,sDAAsD;QAC3D,aAAa,EAAE,4BAA4B;KAC5C;IACD,qBAAqB,EAAE;QACrB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,qBAAqB;QAC5B,GAAG,EAAE,kDAAkD;QACvD,aAAa,EAAE,qBAAqB;KACrC;IACD,6BAA6B,EAAE;QAC7B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,sCAAsC;QAC7C,GAAG,EAAE,sDAAsD;QAC3D,aAAa,EAAE,wCAAwC;KACxD;IACD,mBAAmB,EAAE;QACnB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,mBAAmB;QAC1B,GAAG,EAAE,6DAA6D;QAClE,aAAa,EAAE,mBAAmB;KACnC;IACD,YAAY,EAAE;QACZ,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,uBAAuB;QAC9B,GAAG,EAAE,uEAAuE;QAC5E,aAAa,EAAE,YAAY;KAC5B;IACD,8BAA8B,EAAE;QAC9B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,8BAA8B;QACrC,GAAG,EAAE,6LAA6L;QAClM,aAAa,EAAE,8BAA8B;QAC7C,SAAS,EAAE,qBAAqB;KACjC;IACD,yFAAyF;IACzF,0FAA0F;IAC1F,qFAAqF;IACrF,0FAA0F;IAC1F,gFAAgF;IAChF,qBAAqB,EAAE;QACrB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,qBAAqB;QAC5B,GAAG,EAAE,8JAA8J;QACnK,aAAa,EAAE,qBAAqB;QACpC,SAAS,EAAE,qBAAqB;KACjC;IACD,uBAAuB,EAAE;QACvB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,uBAAuB;QAC9B,GAAG,EAAE,wEAAwE;QAC7E,aAAa,EAAE,uBAAuB;QACtC,SAAS,EAAE,qBAAqB;KACjC;IACD,4BAA4B,EAAE;QAC5B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,4BAA4B;QACnC,GAAG,EAAE,wGAAwG;QAC7G,aAAa,EAAE,4BAA4B;QAC3C,SAAS,EAAE,qBAAqB;KACjC;IACD,sFAAsF;IACtF,yFAAyF;IACzF,sFAAsF;IACtF,2FAA2F;IAC3F,6FAA6F;IAC7F,2CAA2C;IAC3C,YAAY,EAAE;QACZ,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,YAAY;QACnB,GAAG,EAAE,+DAA+D;QACpE,aAAa,EAAE,YAAY;QAC3B,SAAS,EAAE,qBAAqB;KACjC;IACD,uBAAuB,EAAE;QACvB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,uBAAuB;QAC9B,GAAG,EAAE,kFAAkF;QACvF,aAAa,EAAE,uBAAuB;QACtC,SAAS,EAAE,qBAAqB;KACjC;IACD,qBAAqB,EAAE;QACrB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,qBAAqB;QAC5B,GAAG,EAAE,qEAAqE;QAC1E,aAAa,EAAE,qBAAqB;QACpC,SAAS,EAAE,qBAAqB;KACjC;IACD,qBAAqB,EAAE;QACrB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,iCAAiC;QACxC,GAAG,EAAE,qHAAqH;QAC1H,aAAa,EAAE,qBAAqB;QACpC,SAAS,EAAE,qBAAqB;KACjC;IACD,uBAAuB,EAAE;QACvB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,uBAAuB;QAC9B,GAAG,EAAE,oDAAoD;QACzD,aAAa,EAAE,uBAAuB;QACtC,SAAS,EAAE,SAAS;KACrB;IACD,mBAAmB,EAAE;QACnB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,eAAe;QACtB,GAAG,EAAE,sDAAsD;QAC3D,aAAa,EAAE,mBAAmB;QAClC,SAAS,EAAE,SAAS;KACrB;IACD,0BAA0B,EAAE;QAC1B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,8BAA8B;QACrC,GAAG,EAAE,6CAA6C;QAClD,aAAa,EAAE,0BAA0B;QACzC,SAAS,EAAE,SAAS;KACrB;IACD,4BAA4B,EAAE;QAC5B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,4BAA4B;QACnC,GAAG,EAAE,+DAA+D;QACpE,aAAa,EAAE,4BAA4B;QAC3C,SAAS,EAAE,SAAS;KACrB;IACD,gDAAgD,EAAE;QAChD,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,4BAA4B;QACnC,GAAG,EAAE,2CAA2C;QAChD,aAAa,EAAE,0BAA0B;QACzC,SAAS,EAAE,uBAAuB;KACnC;IACD,iCAAiC,EAAE;QACjC,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,2BAA2B;QAClC,GAAG,EAAE,2EAA2E;QAChF,aAAa,EAAE,2BAA2B;QAC1C,SAAS,EAAE,uBAAuB;KACnC;IACD,sBAAsB,EAAE;QACtB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,sCAAsC;QAC7C,GAAG,EAAE,+CAA+C;QACpD,aAAa,EAAE,oCAAoC;KACpD;IACD,qBAAqB,EAAE;QACrB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,gCAAgC;QACvC,GAAG,EAAE,gEAAgE;QACrE,aAAa,EAAE,gCAAgC;KAChD;IACD,oBAAoB,EAAE;QACpB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,iCAAiC;QACxC,GAAG,EAAE,+DAA+D;QACpE,aAAa,EAAE,gCAAgC;QAC/C,SAAS,EAAE,uBAAuB;KACnC;IACD,uBAAuB,EAAE;QACvB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,2BAA2B;QAClC,GAAG,EAAE,sDAAsD;QAC3D,aAAa,EAAE,iCAAiC;QAChD,SAAS,EAAE,uBAAuB;KACnC;IACD,uBAAuB,EAAE;QACvB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,qDAAqD;QAC5D,GAAG,EAAE,qDAAqD;QAC1D,aAAa,EAAE,uCAAuC;QACtD,SAAS,EAAE,uBAAuB;KACnC;IACD,yBAAyB,EAAE;QACzB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,6BAA6B;QACpC,GAAG,EAAE,uFAAuF;QAC5F,aAAa,EAAE,6CAA6C;QAC5D,SAAS,EAAE,uBAAuB;KACnC;IACD,4BAA4B,EAAE;QAC5B,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,4BAA4B;QACnC,GAAG,EAAE,qGAAqG;QAC1G,aAAa,EAAE,kCAAkC;QACjD,SAAS,EAAE,uBAAuB;KACnC;IACD,gCAAgC,EAAE;QAChC,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,6CAA6C;QACpD,GAAG,EAAE,4DAA4D;QACjE,aAAa,EAAE,gCAAgC;QAC/C,SAAS,EAAE,uBAAuB;KACnC;IACD,8BAA8B,EAAE;QAC9B,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,uCAAuC;QAC9C,GAAG,EAAE,2EAA2E;QAChF,aAAa,EAAE,gCAAgC;QAC/C,SAAS,EAAE,uBAAuB;KACnC;IACD,0BAA0B,EAAE;QAC1B,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,0BAA0B;QACjC,GAAG,EAAE,sEAAsE;QAC3E,aAAa,EAAE,sCAAsC;QACrD,SAAS,EAAE,uBAAuB;KACnC;IACD,2BAA2B,EAAE;QAC3B,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,mDAAmD;QAC1D,GAAG,EAAE,gPAAgP;QACrP,aAAa,EAAE,gCAAgC;QAC/C,SAAS,EAAE,kBAAkB;KAC9B;IACD,2BAA2B,EAAE;QAC3B,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,6CAA6C;QACpD,GAAG,EAAE,iGAAiG;QACtG,aAAa,EAAE,gCAAgC;QAC/C,SAAS,EAAE,kBAAkB;KAC9B;IACD,4BAA4B,EAAE;QAC5B,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,gCAAgC;QACvC,GAAG,EAAE,kGAAkG;QACvG,aAAa,EAAE,2BAA2B;QAC1C,SAAS,EAAE,kBAAkB;KAC9B;IACD,uBAAuB,EAAE;QACvB,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,2CAA2C;QAClD,GAAG,EAAE,mHAAmH;QACxH,aAAa,EAAE,oCAAoC;QACnD,SAAS,EAAE,uBAAuB;KACnC;IACD,qBAAqB,EAAE;QACrB,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,mCAAmC;QAC1C,GAAG,EAAE,yGAAyG;QAC9G,aAAa,EAAE,4BAA4B;QAC3C,SAAS,EAAE,uBAAuB;KACnC;IACD,wCAAwC,EAAE;QACxC,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,8BAA8B;QACrC,GAAG,EAAE,yQAAyQ;QAC9Q,aAAa,EAAE,wCAAwC;QACvD,SAAS,EAAE,qBAAqB;KACjC;IACD,wCAAwC,EAAE;QACxC,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,2DAA2D;QAClE,GAAG,EAAE,+TAA+T;QACpU,aAAa,EAAE,yCAAyC;QACxD,SAAS,EAAE,+BAA+B;KAC3C;IACD,oCAAoC,EAAE;QACpC,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,4CAA4C;QACnD,GAAG,EAAE,+MAA+M;QACpN,aAAa,EAAE,oCAAoC;QACnD,SAAS,EAAE,2BAA2B;KACvC;IACD,oBAAoB,EAAE;QACpB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,oBAAoB;QAC3B,GAAG,EAAE,uHAAuH;QAC5H,aAAa,EAAE,uDAAuD;QACtE,SAAS,EAAE,oBAAoB;KAChC;IACD,0BAA0B,EAAE;QAC1B,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,oCAAoC;QAC3C,GAAG,EAAE,0JAA0J;QAC/J,aAAa,EAAE,oCAAoC;KACpD;IACD,sBAAsB,EAAE;QACtB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,sBAAsB;QAC7B,GAAG,EAAE,+CAA+C;QACpD,aAAa,EAAE,sBAAsB;KACtC;IACD,uBAAuB,EAAE;QACvB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,uBAAuB;QAC9B,GAAG,EAAE,iDAAiD;QACtD,aAAa,EAAE,uBAAuB;KACvC;IACD,oBAAoB,EAAE;QACpB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,oBAAoB;QAC3B,GAAG,EAAE,8CAA8C;QACnD,aAAa,EAAE,oBAAoB;KACpC;IACD,sBAAsB,EAAE;QACtB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,sBAAsB;QAC7B,GAAG,EAAE,gDAAgD;QACrD,aAAa,EAAE,sBAAsB;KACtC;IACD,oBAAoB,EAAE;QACpB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,oBAAoB;QAC3B,GAAG,EAAE,8CAA8C;QACnD,aAAa,EAAE,oBAAoB;KACpC;IACD,6FAA6F;IAC7F,wFAAwF;IACxF,4FAA4F;IAC5F,2FAA2F;IAC3F,2CAA2C;IAC3C,qBAAqB,EAAE;QACrB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,qBAAqB;QAC5B,GAAG,EAAE,6FAA6F;QAClG,aAAa,EAAE,qBAAqB;KACrC;IACD,+EAA+E;IAC/E,8FAA8F;IAC9F,gGAAgG;IAChG,+FAA+F;IAC/F,+FAA+F;IAC/F,+FAA+F;IAC/F,4CAA4C;IAC5C,iCAAiC,EAAE;QACjC,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,wCAAwC;QAC/C,GAAG,EAAE,gFAAgF;QACrF,aAAa,EAAE,wCAAwC;KACxD;IACD,4FAA4F;IAC5F,6FAA6F;IAC7F,uFAAuF;IACvF,uEAAuE;IACvE,wBAAwB,EAAE;QACxB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,8CAA8C;QACrD,GAAG,EAAE,8HAA8H;QACnI,aAAa,EAAE,wBAAwB;KACxC;IACD,yFAAyF;IACzF,0FAA0F;IAC1F,wFAAwF;IACxF,4EAA4E;IAC5E,oBAAoB,EAAE;QACpB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,wCAAwC;QAC/C,GAAG,EAAE,2IAA2I;QAChJ,aAAa,EAAE,oBAAoB;KACpC;IACD,2FAA2F;IAC3F,2FAA2F;IAC3F,4FAA4F;IAC5F,6EAA6E;IAC7E,kFAAkF;IAClF,2EAA2E;IAC3E,4FAA4F;IAC5F,qFAAqF;IACrF,yBAAyB,EAAE;QACzB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,uBAAuB;QAC9B,GAAG,EAAE,gLAAgL;QACrL,aAAa,EAAE,uBAAuB;QACtC,SAAS,EAAE,eAAe;KAC3B;IACD,2BAA2B,EAAE;QAC3B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,0DAA0D;QACjE,GAAG,EAAE,6EAA6E;QAClF,aAAa,EAAE,kCAAkC;QACjD,SAAS,EAAE,eAAe;KAC3B;IACD,6FAA6F;IAC7F,0BAA0B,EAAE;QAC1B,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,6BAA6B;QACpC,GAAG,EAAE,4JAA4J;QACjK,aAAa,EAAE,wBAAwB;QACvC,SAAS,EAAE,eAAe;KAC3B;IACD,wFAAwF;IACxF,wBAAwB,EAAE;QACxB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,mDAAmD;QAC1D,GAAG,EAAE,yGAAyG;QAC9G,aAAa,EAAE,wBAAwB;QACvC,SAAS,EAAE,eAAe;KAC3B;IACD,0BAA0B,EAAE;QAC1B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,kDAAkD;QACzD,GAAG,EAAE,sHAAsH;QAC3H,aAAa,EAAE,0BAA0B;QACzC,SAAS,EAAE,eAAe;KAC3B;IACD,4FAA4F;IAC5F,6FAA6F;IAC7F,sBAAsB,EAAE;QACtB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,uEAAuE;QAC9E,GAAG,EAAE,4MAA4M;QACjN,aAAa,EAAE,sBAAsB;QACrC,SAAS,EAAE,eAAe;KAC3B;IACD,0BAA0B,EAAE;QAC1B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,gCAAgC;QACvC,GAAG,EAAE,kIAAkI;QACvI,aAAa,EAAE,0BAA0B;QACzC,SAAS,EAAE,eAAe;KAC3B;IACD,wBAAwB,EAAE;QACxB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,6BAA6B;QACpC,GAAG,EAAE,sFAAsF;QAC3F,aAAa,EAAE,wBAAwB;QACvC,SAAS,EAAE,eAAe;KAC3B;IACD,4BAA4B,EAAE;QAC5B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,iCAAiC;QACxC,GAAG,EAAE,qFAAqF;QAC1F,aAAa,EAAE,8BAA8B;QAC7C,SAAS,EAAE,eAAe;KAC3B;IACD,gBAAgB,EAAE;QAChB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,gBAAgB;QACvB,GAAG,EAAE,uCAAuC;QAC5C,aAAa,EAAE,gBAAgB;QAC/B,SAAS,EAAE,eAAe;KAC3B;IACD,uBAAuB,EAAE;QACvB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,oCAAoC;QAC3C,GAAG,EAAE,qFAAqF;QAC1F,aAAa,EAAE,uCAAuC;QACtD,SAAS,EAAE,eAAe;KAC3B;IACD,qBAAqB,EAAE;QACrB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,uCAAuC;QAC9C,GAAG,EAAE,8EAA8E;QACnF,aAAa,EAAE,+CAA+C;QAC9D,SAAS,EAAE,eAAe;KAC3B;IACD,2BAA2B,EAAE;QAC3B,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,iDAAiD;QACxD,GAAG,EAAE,mFAAmF;QACxF,aAAa,EAAE,2BAA2B;QAC1C,SAAS,EAAE,eAAe;KAC3B;IACD,mGAAmG;IACnG,eAAe,EAAE;QACf,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,wDAAwD;QAC/D,GAAG,EAAE,4KAA4K;QACjL,aAAa,EAAE,eAAe;QAC9B,SAAS,EAAE,YAAY;KACxB;IACD,0BAA0B,EAAE;QAC1B,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,kDAAkD;QACzD,GAAG,EAAE,mJAAmJ;QACxJ,aAAa,EAAE,0BAA0B;QACzC,SAAS,EAAE,YAAY;KACxB;IACD,wBAAwB,EAAE;QACxB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,wCAAwC;QAC/C,GAAG,EAAE,yIAAyI;QAC9I,aAAa,EAAE,wBAAwB;QACvC,SAAS,EAAE,YAAY;KACxB;IACD,iBAAiB,EAAE;QACjB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,0BAA0B;QACjC,GAAG,EAAE,4FAA4F;QACjG,aAAa,EAAE,iBAAiB;QAChC,SAAS,EAAE,YAAY;KACxB;IACD,+FAA+F;IAC/F,6FAA6F;IAC7F,4FAA4F;IAC5F,0FAA0F;IAC1F,8CAA8C;IAC9C,qBAAqB,EAAE;QACrB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,qBAAqB;QAC5B,GAAG,EAAE,uFAAuF;QAC5F,aAAa,EAAE,qBAAqB;QACpC,SAAS,EAAE,qBAAqB;KACjC;IACD,+FAA+F;IAC/F,iGAAiG;IACjG,uFAAuF;IACvF,4FAA4F;IAC5F,iFAAiF;IACjF,yBAAyB,EAAE;QACzB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,wBAAwB;QAC/B,GAAG,EAAE,kHAAkH;QACvH,aAAa,EAAE,wBAAwB;QACvC,SAAS,EAAE,YAAY;KACxB;IACD,yBAAyB,EAAE;QACzB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,wBAAwB;QAC/B,GAAG,EAAE,oGAAoG;QACzG,aAAa,EAAE,6BAA6B;QAC5C,SAAS,EAAE,YAAY;KACxB;IACD,8CAA8C,EAAE;QAC9C,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,uCAAuC;QAC9C,GAAG,EAAE,oIAAoI;QACzI,aAAa,EAAE,mCAAmC;QAClD,SAAS,EAAE,YAAY;KACxB;IACD,iCAAiC,EAAE;QACjC,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,yCAAyC;QAChD,GAAG,EAAE,4FAA4F;QACjG,aAAa,EAAE,sCAAsC;QACrD,SAAS,EAAE,YAAY;KACxB;IACD,6BAA6B,EAAE;QAC7B,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,oDAAoD;QAC3D,GAAG,EAAE,0HAA0H;QAC/H,aAAa,EAAE,qCAAqC;QACpD,SAAS,EAAE,YAAY;KACxB;IACD,2FAA2F;IAC3F,mFAAmF;IACnF,uBAAuB,EAAE;QACvB,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,iCAAiC;QACxC,GAAG,EAAE,qIAAqI;QAC1I,aAAa,EAAE,+BAA+B;QAC9C,SAAS,EAAE,OAAO;QAClB,MAAM,EAAE,OAAO;KAChB;IACD,2BAA2B,EAAE;QAC3B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,2BAA2B;QAClC,GAAG,EAAE,oDAAoD;QACzD,aAAa,EAAE,gCAAgC;QAC/C,SAAS,EAAE,iBAAiB;QAC5B,KAAK,EAAE,IAAI;KACZ;IACD,0BAA0B,EAAE;QAC1B,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,cAAc;QACrB,GAAG,EAAE,gDAAgD;QACrD,aAAa,EAAE,oCAAoC;QACnD,SAAS,EAAE,iBAAiB;QAC5B,KAAK,EAAE,IAAI;KACZ;IACD,8BAA8B,EAAE;QAC9B,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,wBAAwB;QAC/B,GAAG,EAAE,mCAAmC;QACxC,aAAa,EAAE,0CAA0C;QACzD,SAAS,EAAE,iBAAiB;QAC5B,KAAK,EAAE,IAAI;KACZ;IACD,sCAAsC,EAAE;QACtC,QAAQ,EAAE,SAAS;QACnB,KAAK,EAAE,0BAA0B;QACjC,GAAG,EAAE,yCAAyC;QAC9C,aAAa,EAAE,gDAAgD;QAC/D,SAAS,EAAE,iBAAiB;QAC5B,KAAK,EAAE,IAAI;KACZ;IACD,0BAA0B,EAAE;QAC1B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,cAAc;QACrB,GAAG,EAAE,yDAAyD;QAC9D,aAAa,EAAE,gCAAgC;QAC/C,SAAS,EAAE,iBAAiB;QAC5B,KAAK,EAAE,IAAI;KACZ;IACD,2BAA2B,EAAE;QAC3B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,0CAA0C;QACjD,GAAG,EAAE,mOAAmO;QACxO,aAAa,EAAE,0BAA0B;QACzC,SAAS,EAAE,iBAAiB;QAC5B,KAAK,EAAE,IAAI;KACZ;IACD,2BAA2B,EAAE;QAC3B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,0CAA0C;QACjD,GAAG,EAAE,6KAA6K;QAClL,aAAa,EAAE,0BAA0B;QACzC,SAAS,EAAE,iBAAiB;QAC5B,KAAK,EAAE,IAAI;KACZ;IACD,gBAAgB,EAAE;QAChB,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,yBAAyB;QAChC,GAAG,EAAE,0IAA0I;QAC/I,aAAa,EAAE,yBAAyB;QACxC,SAAS,EAAE,iBAAiB;QAC5B,KAAK,EAAE,IAAI;KACZ;IACD,6CAA6C,EAAE;QAC7C,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,iCAAiC;QACxC,GAAG,EAAE,6SAA6S;QAClT,aAAa,EAAE,6CAA6C;QAC5D,SAAS,EAAE,iBAAiB;QAC5B,KAAK,EAAE,IAAI;KACZ;IACD,mCAAmC,EAAE;QACnC,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,+BAA+B;QACtC,GAAG,EAAE,qRAAqR;QAC1R,aAAa,EAAE,oDAAoD;QACnE,SAAS,EAAE,iBAAiB;QAC5B,KAAK,EAAE,IAAI;KACZ;IACD,uCAAuC,EAAE;QACvC,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,kCAAkC;QACzC,GAAG,EAAE,yWAAyW;QAC9W,aAAa,EAAE,wCAAwC;QACvD,SAAS,EAAE,eAAe;QAC1B,KAAK,EAAE,IAAI;KACZ;IACD,4BAA4B,EAAE;QAC5B,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,2BAA2B;QAClC,GAAG,EAAE,+EAA+E;QACpF,aAAa,EAAE,+CAA+C;QAC9D,SAAS,EAAE,iBAAiB;QAC5B,KAAK,EAAE,IAAI;KACZ;IACD,0CAA0C,EAAE;QAC1C,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,8BAA8B;QACrC,GAAG,EAAE,0HAA0H;QAC/H,aAAa,EAAE,0CAA0C;QACzD,SAAS,EAAE,iBAAiB;QAC5B,KAAK,EAAE,IAAI;KACZ;CACyC,CAAC;AAI7C;;;mEAGmE;AACnE,MAAM,UAAU,QAAQ,CAAC,IAAc,EAAE,KAA0D;IACjG,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IACzB,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,uCAAuC,CAAC,CAAC;IACxG,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,CAAC;AACrD,CAAC;AAED,kGAAkG;AAClG,MAAM,UAAU,QAAQ,CAAC,KAAmB,EAAE,IAAc,EAAE,KAA0D;IACtH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;AACpC,CAAC"}
@@ -1,7 +1,7 @@
1
1
  // SPDX-License-Identifier: MIT
2
2
  // Event-modeling rule checks over the normalized model + grid.
3
3
  import { AUTOMATION_KINDS } from "../parser/ast.js";
4
- import { collectModelInvariants, collectTags, MODEL_INVARIANT_ID_RE, PUBLIC_SCALAR_TYPE_NAMES, normalizeName, recordingCommandsOf, resolvePublicType, resolveTypeRef, } from "./model.js";
4
+ import { collectModelInvariants, collectTags, MODEL_INVARIANT_ID_RE, PUBLIC_SCALAR_TYPE_NAMES, PUBLIC_SCALAR_TYPES, normalizeName, recordingCommandsOf, resolvePublicType, resolveTypeRef, } from "./model.js";
5
5
  import { pushDiag } from "./rules.js";
6
6
  import { viewSourceNames } from "./continuation.js";
7
7
  import { connectionKind, resolveLoopsToTarget, semanticEdges } from "./edges.js";
@@ -1036,6 +1036,139 @@ export function validate(model, grid, refs) {
1036
1036
  });
1037
1037
  }
1038
1038
  }
1039
+ // GH #477: `scalar Name: base` declarations — unlike a duplicate `type` name (a warning,
1040
+ // first-wins), these three are errors in the house style: a scalar is a wire-identity
1041
+ // declaration, so getting it wrong is a contract defect, not a cosmetic duplicate.
1042
+ const scalarsByNormalizedName = new Map();
1043
+ for (const s of model.scalars) {
1044
+ const key = normalizeName(s.name);
1045
+ const bucket = scalarsByNormalizedName.get(key);
1046
+ if (bucket)
1047
+ bucket.push(s);
1048
+ else
1049
+ scalarsByNormalizedName.set(key, [s]);
1050
+ }
1051
+ for (const decls of scalarsByNormalizedName.values()) {
1052
+ if (decls.length > 1) {
1053
+ pushDiag(diags, "scalar-duplicate-name", {
1054
+ message: `scalar "${decls[0].name}" is declared ${decls.length} times (lines ${decls.map((d) => d.line).join(", ")}) — declare it once`,
1055
+ line: decls[0].line,
1056
+ refs: decls.map((s) => refs.refByScalarId.get(s.id)),
1057
+ });
1058
+ }
1059
+ }
1060
+ for (const s of model.scalars) {
1061
+ const base = normalizeName(s.base);
1062
+ if (!Object.prototype.hasOwnProperty.call(PUBLIC_SCALAR_TYPES, base)) {
1063
+ pushDiag(diags, "scalar-unknown-base", {
1064
+ message: `scalar "${s.name}" names base "${s.base}", which is not a public scalar table entry — ` +
1065
+ `use ${PUBLIC_TYPE_TABLE_TEXT} (case-insensitive)`,
1066
+ line: s.line,
1067
+ refs: [refs.refByScalarId.get(s.id)],
1068
+ });
1069
+ }
1070
+ }
1071
+ // A scalar and a declared `type` can never legitimately share a name — each resolves a field
1072
+ // to a different kind of thing (a wire-level identity alias vs. a nested structured shape).
1073
+ // Checked once per colliding name (not once per side), `refs` naming every entity involved.
1074
+ for (const [key, typeDecls] of typesByNormalizedName) {
1075
+ const scalarDecls = scalarsByNormalizedName.get(key);
1076
+ if (!scalarDecls)
1077
+ continue;
1078
+ const firstType = typeDecls[0];
1079
+ const firstScalar = scalarDecls[0];
1080
+ const firstLine = Math.min(firstType.line, firstScalar.line);
1081
+ pushDiag(diags, "scalar-type-name-collision", {
1082
+ message: `"${firstType.name}" names both a \`scalar\` (line ${firstScalar.line}) and a \`type\` ` +
1083
+ `(line ${firstType.line}) — a name can't mean both; rename one`,
1084
+ line: firstLine,
1085
+ refs: [
1086
+ ...typeDecls.map((t) => refs.refByTypeId.get(t.id)),
1087
+ ...scalarDecls.map((s) => refs.refByScalarId.get(s.id)),
1088
+ ],
1089
+ });
1090
+ }
1091
+ // GH #478: `enum Name { member, … }` declarations — same house-style posture as #477's
1092
+ // scalar errors above (a wire-identity value-set declaration, not a cosmetic duplicate).
1093
+ const enumsByNormalizedName = new Map();
1094
+ for (const e of model.enums) {
1095
+ const key = normalizeName(e.name);
1096
+ const bucket = enumsByNormalizedName.get(key);
1097
+ if (bucket)
1098
+ bucket.push(e);
1099
+ else
1100
+ enumsByNormalizedName.set(key, [e]);
1101
+ }
1102
+ for (const decls of enumsByNormalizedName.values()) {
1103
+ if (decls.length > 1) {
1104
+ pushDiag(diags, "enum-duplicate-name", {
1105
+ message: `enum "${decls[0].name}" is declared ${decls.length} times (lines ${decls.map((d) => d.line).join(", ")}) — declare it once`,
1106
+ line: decls[0].line,
1107
+ refs: decls.map((e) => refs.refByEnumId.get(e.id)),
1108
+ });
1109
+ }
1110
+ }
1111
+ for (const e of model.enums) {
1112
+ if (e.members.length === 0) {
1113
+ pushDiag(diags, "enum-empty", {
1114
+ message: `enum "${e.name}" has no members — give it at least one`,
1115
+ line: e.line,
1116
+ refs: [refs.refByEnumId.get(e.id)],
1117
+ });
1118
+ }
1119
+ const seen = new Map();
1120
+ for (const m of e.members) {
1121
+ const key = normalizeName(m);
1122
+ const earlier = seen.get(key);
1123
+ if (earlier) {
1124
+ pushDiag(diags, "enum-duplicate-member", {
1125
+ message: `enum "${e.name}" has duplicate member "${earlier}"/"${m}" (case-insensitive) — remove or rename one`,
1126
+ line: e.line,
1127
+ refs: [refs.refByEnumId.get(e.id)],
1128
+ });
1129
+ }
1130
+ else {
1131
+ seen.set(key, m);
1132
+ }
1133
+ }
1134
+ }
1135
+ // An enum can never legitimately share a name with a declared `type` or a declared `scalar`
1136
+ // — each resolves a field to a different kind of thing. Checked once per colliding name (not
1137
+ // once per side), `refs` naming every entity involved, both directions.
1138
+ for (const [key, typeDecls] of typesByNormalizedName) {
1139
+ const enumDecls = enumsByNormalizedName.get(key);
1140
+ if (!enumDecls)
1141
+ continue;
1142
+ const firstType = typeDecls[0];
1143
+ const firstEnum = enumDecls[0];
1144
+ const firstLine = Math.min(firstType.line, firstEnum.line);
1145
+ pushDiag(diags, "enum-name-collision", {
1146
+ message: `"${firstType.name}" names both an \`enum\` (line ${firstEnum.line}) and a \`type\` ` +
1147
+ `(line ${firstType.line}) — a name can't mean both; rename one`,
1148
+ line: firstLine,
1149
+ refs: [
1150
+ ...typeDecls.map((t) => refs.refByTypeId.get(t.id)),
1151
+ ...enumDecls.map((e) => refs.refByEnumId.get(e.id)),
1152
+ ],
1153
+ });
1154
+ }
1155
+ for (const [key, scalarDecls] of scalarsByNormalizedName) {
1156
+ const enumDecls = enumsByNormalizedName.get(key);
1157
+ if (!enumDecls)
1158
+ continue;
1159
+ const firstScalar = scalarDecls[0];
1160
+ const firstEnum = enumDecls[0];
1161
+ const firstLine = Math.min(firstScalar.line, firstEnum.line);
1162
+ pushDiag(diags, "enum-name-collision", {
1163
+ message: `"${firstScalar.name}" names both an \`enum\` (line ${firstEnum.line}) and a \`scalar\` ` +
1164
+ `(line ${firstScalar.line}) — a name can't mean both; rename one`,
1165
+ line: firstLine,
1166
+ refs: [
1167
+ ...scalarDecls.map((s) => refs.refByScalarId.get(s.id)),
1168
+ ...enumDecls.map((e) => refs.refByEnumId.get(e.id)),
1169
+ ],
1170
+ });
1171
+ }
1039
1172
  // Cyclic type references: recursion through declared types is allowed as a DAG (e.g. a
1040
1173
  // shared `Address` referenced twice is fine), but a cycle — a type transitively nesting
1041
1174
  // itself with no array to terminate it at runtime — can never be satisfied and is an error.
@@ -1197,7 +1330,7 @@ export function findUnresolvedPublicFieldTypes(model) {
1197
1330
  const reachedFrom = new Map();
1198
1331
  const check = (fields, owner, line, origin) => {
1199
1332
  for (const f of fields ?? []) {
1200
- const resolved = resolvePublicType(f.type, model.typesByName);
1333
+ const resolved = resolvePublicType(f.type, model.typesByName, model.scalarsByName, model.enumsByName);
1201
1334
  if (!resolved) {
1202
1335
  out.push({ owner, field: f.name, type: f.type ?? null, line });
1203
1336
  continue;
@@ -1213,7 +1346,7 @@ export function findUnresolvedPublicFieldTypes(model) {
1213
1346
  // Walk the type's own references now (so transitive reach is complete); its findings are
1214
1347
  // collected in a second pass below, in declaration order.
1215
1348
  for (const f of t.fields) {
1216
- const r = resolvePublicType(f.type, model.typesByName);
1349
+ const r = resolvePublicType(f.type, model.typesByName, model.scalarsByName, model.enumsByName);
1217
1350
  if (r && r.kind === "declared")
1218
1351
  reach(r.typeDecl, origin);
1219
1352
  }
@@ -1229,7 +1362,7 @@ export function findUnresolvedPublicFieldTypes(model) {
1229
1362
  if (!origin)
1230
1363
  continue;
1231
1364
  for (const f of t.fields) {
1232
- if (resolvePublicType(f.type, model.typesByName))
1365
+ if (resolvePublicType(f.type, model.typesByName, model.scalarsByName, model.enumsByName))
1233
1366
  continue;
1234
1367
  out.push({ owner: { kind: "type", id: t.id, name: t.name, reachedFrom: origin }, field: f.name, type: f.type ?? null, line: t.line });
1235
1368
  }