sketchmark 2.0.0 → 2.1.1

package/dist/src/shapes/builtins.js

@@ -4,8 +4,6 @@ exports.builtInShapeLowerers = void 0;
 const utils_1 = require("../utils");
 const common_1 = require("./common");
 const geometry_1 = require("./geometry");
-const STYLE_ANIMATABLE = ["opacity", "fill", "stroke", "strokeWidth", "dashOffset", "drawStart", "drawEnd", "rotation", "scale", "scaleX", "scaleY"];
-const THREE_ANIMATABLE = ["opacity", "fill", "stroke", "strokeWidth", "positionX", "positionY", "positionZ", "rotationX", "rotationY", "rotationZ", "scale", "scaleX", "scaleY", "scaleZ"];
 const numberProperty = { type: "number" };
 const stringProperty = { type: "string" };
 const point2Property = { $ref: "#/$defs/point2" };
@@ -14,7 +12,6 @@ exports.builtInShapeLowerers = [
     {
         type: "rect",
         kind: "2d",
-        animatable: [...STYLE_ANIMATABLE, "x", "y", "width", "height"],
         schema: { properties: { x: numberProperty, y: numberProperty, width: numberProperty, height: numberProperty } },
         validateGeometry(element, context) {
             const item = element;
@@ -31,37 +28,21 @@ exports.builtInShapeLowerers = [
     {
         type: "circle",
         kind: "2d",
-        animatable: [...STYLE_ANIMATABLE, "cx", "cy", "radius"],
         schema: { properties: { cx: numberProperty, cy: numberProperty, radius: numberProperty } },
         validateGeometry(element, context) {
             const item = element;
-            if (!item.follow) {
-                context.requireNumber(item.cx, `${context.path}/cx`);
-                context.requireNumber(item.cy, `${context.path}/cy`);
-            }
+            context.requireNumber(item.cx, `${context.path}/cx`);
+            context.requireNumber(item.cy, `${context.path}/cy`);
             context.requireNumber(item.radius, `${context.path}/radius`);
         },
-        validateReferences(element, context) {
-            const item = element;
-            if (!item.follow)
-                return;
-            const followed = context.ids.get(item.follow);
-            if (!followed) {
-                context.addIssue(`${context.path}/follow`, "unknown_follow_target", `Unknown follow target '${item.follow}'.`);
-            }
-            else if (!context.isFollowable(followed.type)) {
-                context.addIssue(`${context.path}/follow`, "invalid_follow_target", `Element '${item.follow}' is not a line, arrow, arc, curve, path, polyline, or polygon.`);
-            }
-        },
         lower(element) {
             const item = element;
-            return (0, common_1.toPath)(item, (0, geometry_1.circlePath)(Number(item.cx ?? 0), Number(item.cy ?? 0), item.radius));
+            return (0, common_1.toPath)(item, (0, geometry_1.circlePath)(item.cx ?? 0, item.cy ?? 0, item.radius));
         }
     },
     {
         type: "ellipse",
         kind: "2d",
-        animatable: [...STYLE_ANIMATABLE, "cx", "cy", "rx", "ry"],
         schema: { properties: { cx: numberProperty, cy: numberProperty, rx: numberProperty, ry: numberProperty } },
         validateGeometry(element, context) {
             const item = element;
@@ -78,8 +59,7 @@ exports.builtInShapeLowerers = [
     {
         type: "line",
         kind: "2d",
-        animatable: [...STYLE_ANIMATABLE],
-        followable: true,
+        pathQueryable: true,
         schema: { properties: { from: endpointProperty, to: endpointProperty } },
         validateGeometry(element, context) {
             const item = element;
@@ -101,8 +81,7 @@ exports.builtInShapeLowerers = [
     {
         type: "arrow",
         kind: "2d",
-        animatable: [...STYLE_ANIMATABLE],
-        followable: true,
+        pathQueryable: true,
         schema: { properties: { from: endpointProperty, to: endpointProperty } },
         validateGeometry(element, context) {
             const item = element;
@@ -128,8 +107,7 @@ exports.builtInShapeLowerers = [
     {
         type: "arc",
         kind: "2d",
-        animatable: [...STYLE_ANIMATABLE, "startAngle", "endAngle"],
-        followable: true,
+        pathQueryable: true,
         schema: { properties: { cx: numberProperty, cy: numberProperty, radius: numberProperty, startAngle: numberProperty, endAngle: numberProperty, counterclockwise: { type: "boolean" }, closed: { type: "boolean" } } },
         validateGeometry(element, context) {
             const item = element;
@@ -149,8 +127,7 @@ exports.builtInShapeLowerers = [
     {
         type: "curve",
         kind: "2d",
-        animatable: [...STYLE_ANIMATABLE],
-        followable: true,
+        pathQueryable: true,
         schema: { properties: { from: endpointProperty, to: endpointProperty, control1: point2Property, control2: point2Property } },
         validateGeometry(element, context) {
             const item = element;
@@ -175,8 +152,7 @@ exports.builtInShapeLowerers = [
     {
         type: "polyline",
         kind: "2d",
-        animatable: [...STYLE_ANIMATABLE],
-        followable: true,
+        pathQueryable: true,
         schema: { properties: { points: { type: "array", items: point2Property } } },
         validateGeometry(element, context) {
             const item = element;
@@ -190,8 +166,7 @@ exports.builtInShapeLowerers = [
     {
         type: "polygon",
         kind: "2d",
-        animatable: [...STYLE_ANIMATABLE],
-        followable: true,
+        pathQueryable: true,
         schema: { properties: { points: { type: "array", items: point2Property } } },
         validateGeometry(element, context) {
             const item = element;
@@ -205,8 +180,7 @@ exports.builtInShapeLowerers = [
     {
         type: "path",
         kind: "2d",
-        animatable: [...STYLE_ANIMATABLE],
-        followable: true,
+        pathQueryable: true,
         schema: { properties: { d: stringProperty } },
         validateGeometry(element, context) {
             const item = element;
@@ -215,13 +189,12 @@ exports.builtInShapeLowerers = [
         },
         lower(element) {
             const item = element;
-            return { ...(0, common_1.common2d)(item), type: "path", d: item.d };
+            return (0, common_1.toPath)(item, item.d);
         }
     },
     {
         type: "text",
         kind: "2d",
-        animatable: [...STYLE_ANIMATABLE, "x", "y"],
         schema: { properties: { x: numberProperty, y: numberProperty, text: stringProperty, lines: { type: "array", items: stringProperty } } },
         validateGeometry(element, context) {
             const item = element;
@@ -267,7 +240,6 @@ exports.builtInShapeLowerers = [
     {
         type: "image",
         kind: "2d",
-        animatable: [...STYLE_ANIMATABLE, "x", "y", "width", "height"],
         schema: { properties: { src: stringProperty, x: numberProperty, y: numberProperty, width: numberProperty, height: numberProperty, fit: { $ref: "#/$defs/imageFit" }, source: { $ref: "#/$defs/imageSource" } } },
         validateGeometry(element, context) {
             const item = element;
@@ -297,7 +269,6 @@ exports.builtInShapeLowerers = [
     {
         type: "point",
         kind: "2d",
-        animatable: [...STYLE_ANIMATABLE, "x", "y"],
         schema: { properties: { x: numberProperty, y: numberProperty } },
         validateGeometry(element, context) {
             const item = element;
@@ -312,7 +283,6 @@ exports.builtInShapeLowerers = [
     {
         type: "group",
         kind: "2d",
-        animatable: [...STYLE_ANIMATABLE, "x", "y"],
         schema: { properties: { x: numberProperty, y: numberProperty, children: { type: "array", items: { $ref: "#/$defs/element" } } } },
         validateGeometry(element, context) {
             const item = element;
@@ -337,7 +307,6 @@ exports.builtInShapeLowerers = [
     {
         type: "cuboid",
         kind: "3d",
-        animatable: [...THREE_ANIMATABLE],
         schema: { properties: { position: { $ref: "#/$defs/point3" }, size: { $ref: "#/$defs/point3" } } },
         validateGeometry(element, context) {
             const item = element;
@@ -353,7 +322,6 @@ exports.builtInShapeLowerers = [
     {
         type: "sphere",
         kind: "3d",
-        animatable: [...THREE_ANIMATABLE],
         schema: { properties: { position: { $ref: "#/$defs/point3" }, radius: numberProperty } },
         validateGeometry(element, context) {
             const item = element;
@@ -369,7 +337,6 @@ exports.builtInShapeLowerers = [
     {
         type: "plane",
         kind: "3d",
-        animatable: [...THREE_ANIMATABLE],
         schema: { properties: { position: { $ref: "#/$defs/point3" }, size: point2Property } },
         validateGeometry(element, context) {
             const item = element;
@@ -385,7 +352,6 @@ exports.builtInShapeLowerers = [
     {
         type: "line3d",
         kind: "3d",
-        animatable: [...THREE_ANIMATABLE],
         schema: { properties: { from: { $ref: "#/$defs/point3" }, to: { $ref: "#/$defs/point3" } } },
         validateGeometry(element, context) {
             const item = element;
@@ -400,7 +366,6 @@ exports.builtInShapeLowerers = [
     {
         type: "text3d",
         kind: "3d",
-        animatable: [...THREE_ANIMATABLE],
         schema: { properties: { text: stringProperty, position: { $ref: "#/$defs/point3" } } },
         validateGeometry(element, context) {
             const item = element;
@@ -416,7 +381,6 @@ exports.builtInShapeLowerers = [
     {
         type: "light",
         kind: "3d",
-        animatable: [...THREE_ANIMATABLE, "intensity"],
         schema: { properties: { kind: { enum: ["ambient", "directional", "point"] }, position: { $ref: "#/$defs/point3" }, intensity: numberProperty } },
         validateGeometry() {
             // Light position is optional for ambient lights and currently permissive for all light kinds.

package/dist/src/shapes/common.js

@@ -10,10 +10,8 @@ exports.cloneOptional = cloneOptional;
 exports.meshElement = meshElement;
 const utils_1 = require("../utils");
 const geometry_1 = require("./geometry");
-const KERNEL_PATH_ANIMATABLE = new Set(["opacity", "fill", "stroke", "strokeWidth", "dashOffset", "drawStart", "drawEnd", "rotation", "scale", "scaleX", "scaleY"]);
 function toPath(element, d, overrides = {}) {
     const base = common2d(element);
-    keepAnimatable(base, KERNEL_PATH_ANIMATABLE);
     return { ...base, ...overrides, type: "path", d };
 }
 function common2d(element) {
@@ -28,19 +26,22 @@ function cleanCommon(element, omit) {
         delete record[key];
     record.clip = lowerClip(record.clip);
     record.mask = lowerMask(record.mask);
+    resolveOrigin(element, record);
     return record;
 }
-function keepAnimatable(record, allowed) {
-    const animation = record.animate;
-    if (!animation || typeof animation !== "object" || Array.isArray(animation))
+function resolveOrigin(element, record) {
+    if ((0, utils_1.isPoint2)(record.origin))
+        return;
+    if ((0, utils_1.isAnchorSpec)(record.origin)) {
+        const box = (0, utils_1.elementBox)(element);
+        if (box)
+            record.origin = (0, utils_1.anchorPoint)(box, record.origin);
         return;
-    const entries = Object.entries(animation).filter(([property]) => allowed.has(property));
-    if (entries.length) {
-        record.animate = Object.fromEntries(entries);
-    }
-    else {
-        delete record.animate;
     }
+    const box = (0, utils_1.elementBox)(element);
+    if (!box)
+        return;
+    record.origin = (0, utils_1.anchorPoint)(box, { kind: "bounds", u: 0.5, v: 0.5 });
 }
 function lowerClip(clip) {
     if (!clip)

package/dist/src/shapes/registry.d.ts

@@ -6,4 +6,3 @@ export declare function getInternalShapeDefinition(type: string): ShapeDefinitio
 export declare function lowerAuthoringElement(element: VisualElement, context: ShapeLoweringContext): KernelElement | KernelElement[];
 export declare function registeredAuthoringShapeTypes(): string[];
 export declare function registeredAuthoringShapeDefinitions(): ShapeDefinition[];
-export declare function isFollowableAuthoringShape(type: string): boolean;

package/dist/src/shapes/registry.js

@@ -6,7 +6,6 @@ exports.getInternalShapeDefinition = getInternalShapeDefinition;
 exports.lowerAuthoringElement = lowerAuthoringElement;
 exports.registeredAuthoringShapeTypes = registeredAuthoringShapeTypes;
 exports.registeredAuthoringShapeDefinitions = registeredAuthoringShapeDefinitions;
-exports.isFollowableAuthoringShape = isFollowableAuthoringShape;
 const builtins_1 = require("./builtins");
 const shapeLowerers = new Map();
 for (const lowerer of builtins_1.builtInShapeLowerers)
@@ -30,6 +29,3 @@ function registeredAuthoringShapeTypes() {
 function registeredAuthoringShapeDefinitions() {
     return [...shapeLowerers.values()];
 }
-function isFollowableAuthoringShape(type) {
-    return Boolean(shapeLowerers.get(type)?.followable);
-}

package/dist/src/shapes/types.d.ts

@@ -16,7 +16,6 @@ export interface ShapeValidationContext {
     requirePoint3(value: unknown, path: string, code: string, message: string): void;
     validateEndpoint(value: unknown, path: string): void;
     validateImageOptions(element: ImageElement): void;
-    isFollowable(type: string): boolean;
 }
 export interface ShapeSchemaFragment {
     properties?: Record<string, unknown>;
@@ -24,8 +23,7 @@ export interface ShapeSchemaFragment {
 export interface ShapeDefinition {
     type: string;
     kind: "2d" | "3d";
-    animatable: string[];
-    followable?: boolean;
+    pathQueryable?: boolean;
     schema?: ShapeSchemaFragment;
     lower(element: VisualElement, context: ShapeLoweringContext): KernelElement | KernelElement[];
     validateGeometry(element: VisualElement, context: ShapeValidationContext): void;