@xom11/whiteboard 0.30.0 → 0.32.0

package/dist/{chunk-SF3U7ZF4.mjs → chunk-DJM5EWTT.mjs}

@@ -122,6 +122,8 @@ var freeModule = defineModule({
     y: z.number().finite()
   }),
   collectRefs: () => [],
+  refSpecs: [],
+  // không có ref — khai rỗng để registry-handled tường minh
   emit: (e, ctx) => [{
     role: "primary",
     object: emitPointObject(ctx.resolveId(e.name), e.name, { kind: "free", x: e.x, y: e.y })
@@ -140,6 +142,10 @@ var midpointModule = defineModule({
     visible: z.boolean().optional()
   }),
   collectRefs: (e) => [e.p1, e.p2],
+  refSpecs: [
+    { field: "p1", role: "point" },
+    { field: "p2", role: "point" }
+  ],
   emit: (e, ctx) => [{
     role: "primary",
     object: emitPointObject(
@@ -150,6 +156,30 @@ var midpointModule = defineModule({
     )
   }]
 });
+var onPerpBisectorModule = defineModule({
+  kind: "onPerpBisector",
+  role: "point",
+  category: "points",
+  prefix: "p",
+  schema: z.object({
+    name: NameZ,
+    kind: z.literal("onPerpBisector"),
+    p1: NameZ,
+    p2: NameZ,
+    t: z.number().optional()
+  }),
+  collectRefs: (e) => [e.p1, e.p2],
+  refSpecs: [{ field: "p1", role: "point" }, { field: "p2", role: "point" }],
+  emit: (e, ctx) => [{
+    role: "primary",
+    object: emitPointObject(ctx.resolveId(e.name), e.name, {
+      kind: "onPerpBisector",
+      p1: ctx.resolveId(e.p1),
+      p2: ctx.resolveId(e.p2),
+      t: e.t ?? 3
+    })
+  }]
+});
 var onSegmentModule = defineModule({
   kind: "onSegment",
   role: "point",
@@ -162,6 +192,7 @@ var onSegmentModule = defineModule({
     t: z.number().min(0).max(1)
   }),
   collectRefs: (e) => [e.segmentId],
+  refSpecs: [{ field: "segmentId", role: "segment" }],
   emit: (e, ctx) => [{
     role: "primary",
     object: emitPointObject(
@@ -183,6 +214,7 @@ var onLineModule = defineModule({
     t: z.number().finite()
   }),
   collectRefs: (e) => [e.lineId],
+  refSpecs: [{ field: "lineId", role: "line-like" }],
   emit: (e, ctx) => [{
     role: "primary",
     object: emitPointObject(
@@ -204,6 +236,7 @@ var onCircleModule = defineModule({
     theta: z.number().finite()
   }),
   collectRefs: (e) => [e.circleId],
+  refSpecs: [{ field: "circleId", role: "circle" }],
   emit: (e, ctx) => [{
     role: "primary",
     object: emitPointObject(
@@ -225,6 +258,10 @@ var perpFootModule = defineModule({
     onLine: NameZ
   }),
   collectRefs: (e) => [e.from, e.onLine],
+  refSpecs: [
+    { field: "from", role: "point" },
+    { field: "onLine", role: "line-like" }
+  ],
   emit: (e, ctx) => [{
     role: "primary",
     object: emitPointObject(
@@ -245,6 +282,7 @@ var circumcenterModule = defineModule({
     vertices: z.tuple([NameZ, NameZ, NameZ])
   }),
   collectRefs: (e) => [...e.vertices],
+  refSpecs: [{ field: "vertices", role: "point", many: true }],
   emit: (e, ctx) => [{
     role: "primary",
     object: emitPointObject(
@@ -265,6 +303,7 @@ var incenterModule = defineModule({
     vertices: z.tuple([NameZ, NameZ, NameZ])
   }),
   collectRefs: (e) => [...e.vertices],
+  refSpecs: [{ field: "vertices", role: "point", many: true }],
   emit: (e, ctx) => [{
     role: "primary",
     object: emitPointObject(
@@ -285,6 +324,7 @@ var centroidModule = defineModule({
     vertices: z.tuple([NameZ, NameZ, NameZ])
   }),
   collectRefs: (e) => [...e.vertices],
+  refSpecs: [{ field: "vertices", role: "point", many: true }],
   emit: (e, ctx) => [{
     role: "primary",
     object: emitPointObject(
@@ -305,6 +345,7 @@ var orthocenterModule = defineModule({
     vertices: z.tuple([NameZ, NameZ, NameZ])
   }),
   collectRefs: (e) => [...e.vertices],
+  refSpecs: [{ field: "vertices", role: "point", many: true }],
   emit: (e, ctx) => [{
     role: "primary",
     object: emitPointObject(
@@ -327,6 +368,10 @@ var intersectionModule = defineModule({
     branch: z.union([z.literal(0), z.literal(1)]).optional()
   }),
   collectRefs: (e) => [e.ref1, e.ref2],
+  refSpecs: [
+    { field: "ref1", role: "line-or-circle" },
+    { field: "ref2", role: "line-or-circle" }
+  ],
   emit: (e, ctx) => {
     const r1IsCircle = ctx.hintOf(e.ref1) === "circle";
     const r2IsCircle = ctx.hintOf(e.ref2) === "circle";
@@ -366,6 +411,10 @@ var segmentModule = defineModule({
     p2: NameZ
   }),
   collectRefs: (e) => [e.p1, e.p2],
+  refSpecs: [
+    { field: "p1", role: "point" },
+    { field: "p2", role: "point" }
+  ],
   emit: (e, ctx) => [{
     role: "primary",
     object: {
@@ -389,6 +438,10 @@ var lineModule = defineModule({
     p2: NameZ
   }),
   collectRefs: (e) => [e.p1, e.p2],
+  refSpecs: [
+    { field: "p1", role: "point" },
+    { field: "p2", role: "point" }
+  ],
   emit: (e, ctx) => [{
     role: "primary",
     object: {
@@ -412,6 +465,10 @@ var rayModule = defineModule({
     through: NameZ
   }),
   collectRefs: (e) => [e.origin, e.through],
+  refSpecs: [
+    { field: "origin", role: "point" },
+    { field: "through", role: "point" }
+  ],
   emit: (e, ctx) => [{
     role: "primary",
     object: {
@@ -435,6 +492,10 @@ var perpendicularModule = defineModule({
     toLine: NameZ
   }),
   collectRefs: (e) => [e.throughPoint, e.toLine],
+  refSpecs: [
+    { field: "throughPoint", role: "point" },
+    { field: "toLine", role: "line-like" }
+  ],
   emit: (e, ctx) => [{
     role: "primary",
     object: {
@@ -464,6 +525,10 @@ var parallelModule = defineModule({
     toLine: NameZ
   }),
   collectRefs: (e) => [e.throughPoint, e.toLine],
+  refSpecs: [
+    { field: "throughPoint", role: "point" },
+    { field: "toLine", role: "line-like" }
+  ],
   emit: (e, ctx) => [{
     role: "primary",
     object: {
@@ -493,6 +558,10 @@ var perpBisectorModule = defineModule({
     p2: NameZ
   }),
   collectRefs: (e) => [e.p1, e.p2],
+  refSpecs: [
+    { field: "p1", role: "point" },
+    { field: "p2", role: "point" }
+  ],
   emit: (e, ctx) => [{
     role: "primary",
     object: {
@@ -523,6 +592,11 @@ var angleBisectorModule = defineModule({
     p2: NameZ
   }),
   collectRefs: (e) => [e.p1, e.vertex, e.p2],
+  refSpecs: [
+    { field: "p1", role: "point" },
+    { field: "vertex", role: "point" },
+    { field: "p2", role: "point" }
+  ],
   emit: (e, ctx) => [{
     role: "primary",
     object: {
@@ -615,6 +689,10 @@ var tangentModule = defineModule({
     branch: z.union([z.literal(0), z.literal(1), z.literal("on")]).optional()
   }),
   collectRefs: (e) => [e.throughPoint, e.toCircle],
+  refSpecs: [
+    { field: "throughPoint", role: "point" },
+    { field: "toCircle", role: "circle" }
+  ],
   emit: (e, ctx) => {
     const construction = {
       kind: "tangent",
@@ -645,6 +723,7 @@ var polygonModule = defineModule({
     vertices: z.array(NameZ).min(3)
   }),
   collectRefs: (e) => [...e.vertices],
+  refSpecs: [{ field: "vertices", role: "point", many: true }],
   emit: (e, ctx) => [{
     role: "primary",
     object: {
@@ -669,6 +748,10 @@ var circleCPModule = defineModule({
     visible: z.boolean().optional()
   }),
   collectRefs: (e) => [e.center, e.surfacePoint],
+  refSpecs: [
+    { field: "center", role: "point" },
+    { field: "surfacePoint", role: "point" }
+  ],
   emit: (e, ctx) => [{
     role: "primary",
     object: {
@@ -694,6 +777,11 @@ var circle3Module = defineModule({
     p3: NameZ
   }),
   collectRefs: (e) => [e.p1, e.p2, e.p3],
+  refSpecs: [
+    { field: "p1", role: "point" },
+    { field: "p2", role: "point" },
+    { field: "p3", role: "point" }
+  ],
   emit: (e, ctx) => [{
     role: "primary",
     object: {
@@ -725,6 +813,7 @@ var circleDiameterModule = defineModule({
     visible: z.boolean().optional()
   }),
   collectRefs: (e) => [e.p1, e.p2],
+  refSpecs: [{ field: "p1", role: "point" }, { field: "p2", role: "point" }],
   emit: (e, ctx) => [{
     role: "primary",
     object: {
@@ -998,9 +1087,30 @@ var arcMidpointModule = defineModule({
     circle: NameZ,
     a: NameZ,
     b: NameZ,
-    notContaining: NameZ
+    // Đúng 1 trong notContaining / containing — bất biến cứng kiểm ở
+    // scene-constraint validate (không .refine vì registry dựng
+    // discriminatedUnion yêu cầu ZodObject thuần).
+    notContaining: NameZ.optional(),
+    containing: NameZ.optional()
   }),
-  collectRefs: (e) => [e.circle, e.a, e.b, e.notContaining],
+  collectRefs: (e) => {
+    const refs = [e.circle, e.a, e.b];
+    const containment = e.notContaining ?? e.containing;
+    if (containment) refs.push(containment);
+    return refs;
+  },
+  // refSpecs động: notContaining/containing TỐI ĐA 1 — có thể không có (cung không mơ hồ).
+  refSpecs: (e) => {
+    const specs = [
+      { field: "circle", role: "circle" },
+      { field: "a", role: "point" },
+      { field: "b", role: "point" }
+    ];
+    if (e.containing ?? e.notContaining) {
+      specs.push({ field: e.containing ? "containing" : "notContaining", role: "point" });
+    }
+    return specs;
+  },
   emit: (e, ctx) => [{
     role: "primary",
     object: emitPointObject(ctx.resolveId(e.name), e.name, {
@@ -1008,7 +1118,8 @@ var arcMidpointModule = defineModule({
       circle: ctx.resolveId(e.circle),
       a: ctx.resolveId(e.a),
       b: ctx.resolveId(e.b),
-      notContaining: ctx.resolveId(e.notContaining)
+      // notContaining/containing optional: cung KHÔNG mơ hồ (nửa đường tròn) → bỏ cả hai.
+      ...e.containing ? { containing: ctx.resolveId(e.containing) } : e.notContaining ? { notContaining: ctx.resolveId(e.notContaining) } : {}
     })
   }]
 });
@@ -1024,6 +1135,10 @@ var excenterModule = defineModule({
     opposite: NameZ
   }),
   collectRefs: (e) => [...e.vertices],
+  refSpecs: [
+    { field: "vertices", role: "point", many: true },
+    { field: "opposite", role: "point" }
+  ],
   emit: (e, ctx) => [{
     role: "primary",
     object: emitPointObject(ctx.resolveId(e.name), e.name, {
@@ -1033,6 +1148,28 @@ var excenterModule = defineModule({
     })
   }]
 });
+var mixtilinearPointModule = defineModule({
+  kind: "mixtilinearPoint",
+  role: "point",
+  category: "points",
+  prefix: "p",
+  schema: z.object({
+    name: NameZ,
+    kind: z.literal("mixtilinearPoint"),
+    vertices: z.tuple([NameZ, NameZ, NameZ]),
+    which: z.union([z.literal("center"), z.literal("touch")])
+  }),
+  collectRefs: (e) => [...e.vertices],
+  refSpecs: [{ field: "vertices", role: "point", many: true }],
+  emit: (e, ctx) => [{
+    role: "primary",
+    object: emitPointObject(ctx.resolveId(e.name), e.name, {
+      kind: "mixtilinearPoint",
+      vertices: resolveTriangleVertices(ctx, e.vertices),
+      which: e.which
+    })
+  }]
+});
 var reflectPointModule = defineModule({
   kind: "reflectPoint",
   role: "point",
@@ -1040,6 +1177,10 @@ var reflectPointModule = defineModule({
   prefix: "p",
   schema: z.object({ name: NameZ, kind: z.literal("reflectPoint"), of: NameZ, through: NameZ }),
   collectRefs: (e) => [e.of, e.through],
+  refSpecs: [
+    { field: "of", role: "point" },
+    { field: "through", role: "point" }
+  ],
   emit: (e, ctx) => [{
     role: "primary",
     object: emitPointObject(ctx.resolveId(e.name), e.name, {
@@ -1056,6 +1197,10 @@ var reflectLineModule = defineModule({
   prefix: "p",
   schema: z.object({ name: NameZ, kind: z.literal("reflectLine"), of: NameZ, through: NameZ }),
   collectRefs: (e) => [e.of, e.through],
+  refSpecs: [
+    { field: "of", role: "point" },
+    { field: "through", role: "line-like" }
+  ],
   emit: (e, ctx) => [{
     role: "primary",
     object: emitPointObject(ctx.resolveId(e.name), e.name, {
@@ -1097,12 +1242,25 @@ var pointAtDistanceModule = defineModule({
     const extra = d.kind === "circleRadius" ? [d.circle] : d.kind === "segmentLength" ? [d.p1, d.p2] : [];
     return [e.from, e.through, ...extra];
   },
-  // TODO(Mức 1 defer): distance.{circle,p1,p2} là nested trong `distance` — refSpec
-  // phẳng đọc top-level không với tới, validate riêng nếu cần. Hiện validate from/through.
-  refSpecs: [
-    { field: "from", role: "point" },
-    { field: "through", role: "point" }
-  ],
+  // refSpecs động: distance.{circle,p1,p2} nested validate qua dotted path
+  // ('distance.circle' — runSpecs ở transpile/refs.ts đọc bằng reduce theo '.').
+  refSpecs: (e) => {
+    const base = [
+      { field: "from", role: "point" },
+      { field: "through", role: "point" }
+    ];
+    if (e.distance.kind === "circleRadius") {
+      return [...base, { field: "distance.circle", role: "circle" }];
+    }
+    if (e.distance.kind === "segmentLength") {
+      return [
+        ...base,
+        { field: "distance.p1", role: "point" },
+        { field: "distance.p2", role: "point" }
+      ];
+    }
+    return base;
+  },
   emit: (e, ctx) => {
     const d = e.distance;
     const distance = d.kind === "circleRadius" ? withScaleOffset({ kind: "circleRadius", circle: ctx.resolveId(d.circle) }, d) : d.kind === "segmentLength" ? withScaleOffset({ kind: "segmentLength", p1: ctx.resolveId(d.p1), p2: ctx.resolveId(d.p2) }, d) : withScaleOffset({ kind: "literal", value: d.value }, d);
@@ -1117,11 +1275,38 @@ var pointAtDistanceModule = defineModule({
     }];
   }
 });
+var commonTangentPointModule = defineModule({
+  kind: "commonTangentPoint",
+  role: "point",
+  category: "points",
+  prefix: "p",
+  schema: z.object({
+    name: NameZ,
+    kind: z.literal("commonTangentPoint"),
+    circles: z.tuple([NameZ, NameZ]),
+    on: z.union([z.literal(0), z.literal(1)]),
+    variant: z.enum(["external", "internal"]),
+    side: z.union([z.literal(0), z.literal(1)])
+  }),
+  collectRefs: (e) => [e.circles[0], e.circles[1]],
+  refSpecs: [{ field: "circles", role: "circle", many: true }],
+  emit: (e, ctx) => [{
+    role: "primary",
+    object: emitPointObject(ctx.resolveId(e.name), e.name, {
+      kind: "commonTangentPoint",
+      circles: [ctx.resolveId(e.circles[0]), ctx.resolveId(e.circles[1])],
+      on: e.on,
+      variant: e.variant,
+      side: e.side
+    })
+  }]
+});
 
 // src/stamps/geometry-2d/dsl/registry.ts
 var ALL_MODULES = [
   freeModule,
   midpointModule,
+  onPerpBisectorModule,
   onSegmentModule,
   onLineModule,
   onCircleModule,
@@ -1158,10 +1343,13 @@ var ALL_MODULES = [
   // Cụm A points
   arcMidpointModule,
   excenterModule,
+  mixtilinearPointModule,
   reflectPointModule,
   reflectLineModule,
   // Cụm B points
-  pointAtDistanceModule
+  pointAtDistanceModule,
+  // 2-circle relations (spec mục A)
+  commonTangentPointModule
 ];
 var KIND_REGISTRY = new Map(ALL_MODULES.map((m) => [m.kind, m]));
 var POINT_KINDS = new Set(
@@ -1294,8 +1482,11 @@ function serializePoint(obj, state) {
       };
     }
     case "arcMidpoint": {
-      const refs = resolveRefs([c.circle, c.a, c.b, c.notContaining], state);
-      if (!refs) return fail("unresolved-ref", `${c.circle},${c.a},${c.b},${c.notContaining}`);
+      const containment = c.containing ?? c.notContaining;
+      const baseRefs = [c.circle, c.a, c.b];
+      if (containment) baseRefs.push(containment);
+      const refs = resolveRefs(baseRefs, state);
+      if (!refs) return fail("unresolved-ref", baseRefs.join(","));
       return {
         ok: true,
         entity: {
@@ -1304,7 +1495,7 @@ function serializePoint(obj, state) {
           circle: refs[0],
           a: refs[1],
           b: refs[2],
-          notContaining: refs[3]
+          ...c.containing ? { containing: refs[3] } : c.notContaining ? { notContaining: refs[3] } : {}
         }
       };
     }
@@ -1341,6 +1532,21 @@ function serializePoint(obj, state) {
         entity: { name: obj.label, kind: "pointAtDistance", from: refs[0], through: refs[1], distance }
       };
     }
+    case "commonTangentPoint": {
+      const refs = resolveRefs([c.circles[0], c.circles[1]], state);
+      if (!refs) return fail("unresolved-ref", `${c.circles[0]},${c.circles[1]}`);
+      return {
+        ok: true,
+        entity: {
+          name: obj.label,
+          kind: "commonTangentPoint",
+          circles: [refs[0], refs[1]],
+          on: c.on,
+          variant: c.variant,
+          side: c.side
+        }
+      };
+    }
     // Out of DSL v1:
     case "onAxis":
     case "onPolygon":
@@ -1348,6 +1554,7 @@ function serializePoint(obj, state) {
     case "onPerpendicular":
     case "onPerpBisector":
     case "onCircleAroundPoint":
+    case "mixtilinearPoint":
       return fail("unsupported-constraint", c.kind);
     default: {
       return fail("unsupported-constraint");
@@ -1644,9 +1851,11 @@ function describeEntity(e) {
       return `${e.name} = \u0111\u01B0\u1EDDng tr\xF2n b\xE0ng ti\u1EBFp ${e.vertices.join("")} \u0111\u1ED1i di\u1EC7n ${e.opposite}`;
     // Cụm A
     case "arcMidpoint":
-      return `${e.name} = trung \u0111i\u1EC3m cung ${e.a}${e.b} (kh\xF4ng ch\u1EE9a ${e.notContaining}) tr\xEAn ${e.circle}`;
+      return `${e.name} = trung \u0111i\u1EC3m cung ${e.a}${e.b}${e.containing || e.notContaining ? ` (${e.containing ? "ch\u1EE9a" : "kh\xF4ng ch\u1EE9a"} ${e.containing ?? e.notContaining})` : ""} tr\xEAn ${e.circle}`;
     case "excenter":
       return `${e.name} = t\xE2m b\xE0ng ti\u1EBFp ${e.vertices.join("")} \u0111\u1ED1i di\u1EC7n ${e.opposite}`;
+    case "mixtilinearPoint":
+      return `${e.name} = ${e.which === "center" ? "t\xE2m" : "ti\u1EBFp \u0111i\u1EC3m"} mixtilinear ${e.vertices.join("")}`;
     case "reflectPoint":
       return `${e.name} = \u0111\u1ED1i x\u1EE9ng ${e.of} qua \u0111i\u1EC3m ${e.through}`;
     case "reflectLine":
@@ -1657,6 +1866,12 @@ function describeEntity(e) {
       const distStr = d.kind === "circleRadius" ? `r(${d.circle})` : d.kind === "segmentLength" ? `|${d.p1}${d.p2}|` : `${d.value}`;
       return `${e.name} = \u0111i\u1EC3m tr\xEAn tia ${e.from}${e.through} c\xE1ch ${e.through} m\u1ED9t kho\u1EA3ng ${distStr}`;
     }
+    case "onPerpBisector":
+      return `${e.name} = \u0111i\u1EC3m tr\xEAn trung tr\u1EF1c ${e.p1}${e.p2}`;
+    case "commonTangentPoint": {
+      const v = e.variant === "internal" ? "trong" : "ngo\xE0i";
+      return `${e.name} = ti\u1EBFp \u0111i\u1EC3m ti\u1EBFp tuy\u1EBFn chung ${v} ${e.circles[0]},${e.circles[1]} (tr\xEAn ${e.circles[e.on]})`;
+    }
     default: {
       return "";
     }
@@ -1675,5 +1890,5 @@ function describeDsl(obj, state) {
 }
 
 export { CIRCLE_KINDS, KIND_REGISTRY, LINE_LIKE_SHAPE_KINDS, POINT_KINDS, describeDsl, fileToImagePart, inferMediaType, validateFile };
-//# sourceMappingURL=chunk-SF3U7ZF4.mjs.map
-//# sourceMappingURL=chunk-SF3U7ZF4.mjs.map
+//# sourceMappingURL=chunk-DJM5EWTT.mjs.map
+//# sourceMappingURL=chunk-DJM5EWTT.mjs.map