triiiceratops 0.9.1 → 0.9.3

package/dist/utils/annotationAdapter.js

@@ -12,7 +12,7 @@ function getAnnotationId(anno) {
 function parseXywh(targetStr) {
     if (!targetStr)
         return null;
-    var match = targetStr.match(/xywh=(\d+),(\d+),(\d+),(\d+)/);
+    const match = targetStr.match(/xywh=(\d+),(\d+),(\d+),(\d+)/);
     if (match) {
         return {
             x: parseInt(match[1], 10),
@@ -28,12 +28,12 @@ function parseXywh(targetStr) {
  */
 function extractGeometry(annotation) {
     // Try to find SVG selector first
-    var svgSelector = findSvgSelector(annotation);
+    const svgSelector = findSvgSelector(annotation);
     if (svgSelector) {
         return convertSvgToPolygon(svgSelector);
     }
     // Extract xywh from target
-    var xywh = extractXywhFromTarget(annotation);
+    const xywh = extractXywhFromTarget(annotation);
     if (xywh) {
         return {
             type: 'RECTANGLE',
@@ -49,17 +49,16 @@ function extractGeometry(annotation) {
  * Find SVG selector in annotation target
  */
 function findSvgSelector(annotation) {
-    var _a, _b;
     // Try Manifesto method
     if (typeof annotation.getTarget === 'function') {
         // For Manifesto, check raw JSON for SVG
-        var rawOn = ((_a = annotation.__jsonld) === null || _a === void 0 ? void 0 : _a.on) || ((_b = annotation.__jsonld) === null || _b === void 0 ? void 0 : _b.target);
+        const rawOn = annotation.__jsonld?.on || annotation.__jsonld?.target;
         if (rawOn) {
             return extractSvgFromTarget(rawOn);
         }
     }
     // Check common locations in raw JSON
-    var target = annotation.target || annotation.on;
+    const target = annotation.target || annotation.on;
     if (target) {
         return extractSvgFromTarget(target);
     }
@@ -73,9 +72,8 @@ function extractSvgFromTarget(target) {
         return null;
     // Handle array of targets
     if (Array.isArray(target)) {
-        for (var _i = 0, target_1 = target; _i < target_1.length; _i++) {
-            var t = target_1[_i];
-            var svg = extractSvgValue(t);
+        for (const t of target) {
+            const svg = extractSvgValue(t);
             if (svg)
                 return svg;
         }
@@ -89,16 +87,15 @@ function extractSvgFromTarget(target) {
  * Extract SVG value from single target object
  */
 function extractSvgValue(target) {
-    var _a;
     if (!target)
         return null;
     // Check for SvgSelector
-    var selector = target.selector || target;
-    if ((selector === null || selector === void 0 ? void 0 : selector.type) === 'SvgSelector' && selector.value) {
+    const selector = target.selector || target;
+    if (selector?.type === 'SvgSelector' && selector.value) {
         return selector.value;
     }
     // Check item (sometimes nested)
-    if (((_a = selector === null || selector === void 0 ? void 0 : selector.item) === null || _a === void 0 ? void 0 : _a.type) === 'SvgSelector' && selector.item.value) {
+    if (selector?.item?.type === 'SvgSelector' && selector.item.value) {
         return selector.item.value;
     }
     return null;
@@ -109,49 +106,46 @@ function extractSvgValue(target) {
  */
 function convertSvgToPolygon(svgString) {
     try {
-        var parser = new DOMParser();
-        var doc = parser.parseFromString(svgString, 'image/svg+xml');
+        const parser = new DOMParser();
+        const doc = parser.parseFromString(svgString, 'image/svg+xml');
         if (doc.documentElement.nodeName === 'parsererror') {
             console.warn('Failed to parse SVG selector:', svgString);
             return null;
         }
-        var points = [];
+        const points = [];
         // Extract points from polygon elements
-        var polygons = doc.querySelectorAll('polygon');
-        for (var _i = 0, polygons_1 = polygons; _i < polygons_1.length; _i++) {
-            var poly = polygons_1[_i];
-            var pointsAttr = poly.getAttribute('points');
+        const polygons = doc.querySelectorAll('polygon');
+        for (const poly of polygons) {
+            const pointsAttr = poly.getAttribute('points');
             if (pointsAttr) {
-                var polyPoints = parsePolygonPoints(pointsAttr);
-                points.push.apply(points, polyPoints);
+                const polyPoints = parsePolygonPoints(pointsAttr);
+                points.push(...polyPoints);
             }
         }
         // Extract points from path elements (simple conversion, doesn't handle curves)
-        var paths = doc.querySelectorAll('path');
-        for (var _a = 0, paths_1 = paths; _a < paths_1.length; _a++) {
-            var path = paths_1[_a];
-            var d = path.getAttribute('d');
+        const paths = doc.querySelectorAll('path');
+        for (const path of paths) {
+            const d = path.getAttribute('d');
             if (d) {
-                var pathPoints = parsePathData(d);
-                points.push.apply(points, pathPoints);
+                const pathPoints = parsePathData(d);
+                points.push(...pathPoints);
             }
         }
         // Extract points from circle/ellipse (approximate as polygon)
-        var circles = doc.querySelectorAll('circle');
-        for (var _b = 0, circles_1 = circles; _b < circles_1.length; _b++) {
-            var circle = circles_1[_b];
-            var cx = parseFloat(circle.getAttribute('cx') || '0');
-            var cy = parseFloat(circle.getAttribute('cy') || '0');
-            var r = parseFloat(circle.getAttribute('r') || '0');
-            var circlePoints = generateCirclePoints(cx, cy, r);
-            points.push.apply(points, circlePoints);
+        const circles = doc.querySelectorAll('circle');
+        for (const circle of circles) {
+            const cx = parseFloat(circle.getAttribute('cx') || '0');
+            const cy = parseFloat(circle.getAttribute('cy') || '0');
+            const r = parseFloat(circle.getAttribute('r') || '0');
+            const circlePoints = generateCirclePoints(cx, cy, r);
+            points.push(...circlePoints);
         }
         if (points.length === 0) {
             return null;
         }
         return {
             type: 'POLYGON',
-            points: points,
+            points,
         };
     }
     catch (e) {
@@ -164,11 +158,10 @@ function convertSvgToPolygon(svgString) {
  * Format: "x1,y1 x2,y2 x3,y3"
  */
 function parsePolygonPoints(pointsStr) {
-    var points = [];
-    var pairs = pointsStr.trim().split(/\s+/);
-    for (var _i = 0, pairs_1 = pairs; _i < pairs_1.length; _i++) {
-        var pair = pairs_1[_i];
-        var _a = pair.split(',').map(function (v) { return parseFloat(v); }), x = _a[0], y = _a[1];
+    const points = [];
+    const pairs = pointsStr.trim().split(/\s+/);
+    for (const pair of pairs) {
+        const [x, y] = pair.split(',').map((v) => parseFloat(v));
         if (!isNaN(x) && !isNaN(y)) {
             points.push([x, y]);
         }
@@ -180,13 +173,13 @@ function parsePolygonPoints(pointsStr) {
  * Extracts M (moveto) and L (lineto) commands
  */
 function parsePathData(d) {
-    var points = [];
+    const points = [];
     // Simple regex: match M and L commands followed by coordinates
-    var commandRegex = /[ML]\s*([\d.]+)[,\s]+([\d.]+)/g;
-    var match;
+    const commandRegex = /[ML]\s*([\d.]+)[,\s]+([\d.]+)/g;
+    let match;
     while ((match = commandRegex.exec(d)) !== null) {
-        var x = parseFloat(match[1]);
-        var y = parseFloat(match[2]);
+        const x = parseFloat(match[1]);
+        const y = parseFloat(match[2]);
         if (!isNaN(x) && !isNaN(y)) {
             points.push([x, y]);
         }
@@ -196,13 +189,12 @@ function parsePathData(d) {
 /**
  * Generate polygon points approximating a circle
  */
-function generateCirclePoints(cx, cy, r, numPoints) {
-    if (numPoints === void 0) { numPoints = 8; }
-    var points = [];
-    for (var i = 0; i < numPoints; i++) {
-        var angle = (i / numPoints) * Math.PI * 2;
-        var x = cx + r * Math.cos(angle);
-        var y = cy + r * Math.sin(angle);
+function generateCirclePoints(cx, cy, r, numPoints = 8) {
+    const points = [];
+    for (let i = 0; i < numPoints; i++) {
+        const angle = (i / numPoints) * Math.PI * 2;
+        const x = cx + r * Math.cos(angle);
+        const y = cy + r * Math.sin(angle);
         points.push([x, y]);
     }
     return points;
@@ -211,23 +203,22 @@ function generateCirclePoints(cx, cy, r, numPoints) {
  * Extract xywh from annotation target (multiple formats)
  */
 function extractXywhFromTarget(annotation) {
-    var _a;
     // Try Manifesto getTarget method
     if (typeof annotation.getTarget === 'function') {
-        var target_2 = annotation.getTarget();
-        if (typeof target_2 === 'string' && target_2.includes('xywh=')) {
-            return parseXywh(target_2);
+        const target = annotation.getTarget();
+        if (typeof target === 'string' && target.includes('xywh=')) {
+            return parseXywh(target);
         }
         // Check raw JSON as fallback
-        var rawOn = (_a = annotation.__jsonld) === null || _a === void 0 ? void 0 : _a.on;
+        const rawOn = annotation.__jsonld?.on;
         if (rawOn) {
-            var xywh = extractXywhFromRawTarget(rawOn);
+            const xywh = extractXywhFromRawTarget(rawOn);
             if (xywh)
                 return xywh;
         }
     }
     // Check raw annotation formats (v2 and v3)
-    var target = annotation.target || annotation.on;
+    const target = annotation.target || annotation.on;
     if (target) {
         return extractXywhFromRawTarget(target);
     }
@@ -241,9 +232,8 @@ function extractXywhFromRawTarget(target) {
         return null;
     // Handle arrays
     if (Array.isArray(target)) {
-        for (var _i = 0, target_3 = target; _i < target_3.length; _i++) {
-            var t = target_3[_i];
-            var xywh = extractXywhFromRawTarget(t);
+        for (const t of target) {
+            const xywh = extractXywhFromRawTarget(t);
             if (xywh)
                 return xywh;
         }
@@ -254,8 +244,8 @@ function extractXywhFromRawTarget(target) {
     }
     // Handle object with selector
     if (target.selector) {
-        var sel = target.selector;
-        var item = sel.item || sel;
+        const sel = target.selector;
+        const item = sel.item || sel;
         if (item.value && typeof item.value === 'string' && item.value.includes('xywh=')) {
             return parseXywh(item.value);
         }
@@ -266,19 +256,18 @@ function extractXywhFromRawTarget(target) {
  * Extract annotation body content (text, label, etc)
  */
 function extractBody(annotation) {
-    var value = '';
-    var isHtml = false;
+    let value = '';
+    let isHtml = false;
     // Try Manifesto getBody method
     if (typeof annotation.getBody === 'function') {
-        var body = annotation.getBody();
+        const body = annotation.getBody();
         if (body && Array.isArray(body)) {
-            var values = [];
-            for (var _i = 0, body_1 = body; _i < body_1.length; _i++) {
-                var b = body_1[_i];
-                var val = b.getValue ? b.getValue() : '';
+            const values = [];
+            for (const b of body) {
+                const val = b.getValue ? b.getValue() : '';
                 if (val) {
                     values.push(val);
-                    var format = b.getFormat ? b.getFormat() : '';
+                    const format = b.getFormat ? b.getFormat() : '';
                     if (format === 'text/html' || format === 'application/html') {
                         isHtml = true;
                     }
@@ -289,23 +278,23 @@ function extractBody(annotation) {
     }
     else {
         // Handle raw JSON body/resource
-        var getText = function (r) {
+        const getText = (r) => {
             if (!r)
                 return '';
             return r.chars || r.value || r['cnt:chars'] || '';
         };
-        var checkHtml = function (r) {
+        const checkHtml = (r) => {
             if (!r)
                 return false;
             return r.format === 'text/html' || r.type === 'TextualBody';
         };
         if (annotation.resource) {
-            var resources = Array.isArray(annotation.resource) ? annotation.resource : [annotation.resource];
+            const resources = Array.isArray(annotation.resource) ? annotation.resource : [annotation.resource];
             value = resources.map(getText).filter(Boolean).join(' ');
             isHtml = resources.some(checkHtml);
         }
         else if (annotation.body) {
-            var bodyArr = Array.isArray(annotation.body) ? annotation.body : [annotation.body];
+            const bodyArr = Array.isArray(annotation.body) ? annotation.body : [annotation.body];
             value = bodyArr.map(getText).filter(Boolean).join(' ');
             isHtml = bodyArr.some(checkHtml);
         }
@@ -319,36 +308,34 @@ function extractBody(annotation) {
             value = Array.isArray(annotation.label) ? annotation.label.join(' ') : annotation.label;
         }
     }
-    return { value: value || 'Annotation', isHtml: isHtml };
+    return { value: value || 'Annotation', isHtml };
 }
 /**
  * Parse Manifesto/IIIF annotation to internal format
  */
-export function parseAnnotation(annotation, index, isSearchHit) {
-    if (isSearchHit === void 0) { isSearchHit = false; }
-    var id = getAnnotationId(annotation) || "anno-".concat(index);
-    var geometry = extractGeometry(annotation);
+export function parseAnnotation(annotation, index, isSearchHit = false) {
+    const id = getAnnotationId(annotation) || `anno-${index}`;
+    const geometry = extractGeometry(annotation);
     // Skip annotations without geometry
     if (!geometry) {
         return null;
     }
-    var body = extractBody(annotation);
+    const body = extractBody(annotation);
     return {
-        id: id,
-        geometry: geometry,
-        body: body,
-        isSearchHit: isSearchHit,
+        id,
+        geometry,
+        body,
+        isSearchHit,
     };
 }
 /**
  * Batch parse annotations
  */
-export function parseAnnotations(annotations, searchHitIds) {
-    if (searchHitIds === void 0) { searchHitIds = new Set(); }
+export function parseAnnotations(annotations, searchHitIds = new Set()) {
     return annotations
-        .map(function (anno, idx) {
-        var isSearchHit = searchHitIds.has(getAnnotationId(anno));
+        .map((anno, idx) => {
+        const isSearchHit = searchHitIds.has(getAnnotationId(anno));
         return parseAnnotation(anno, idx, isSearchHit);
     })
-        .filter(function (anno) { return anno !== null; });
+        .filter((anno) => anno !== null);
 }

package/dist/utils/annotationAdapter.test.js

@@ -1,19 +1,19 @@
 import { describe, it, expect } from "vitest";
 import { parseAnnotation } from "./annotationAdapter";
-describe("annotationAdapter", function () {
-    describe("parseAnnotation", function () {
-        it("should correctly parse a simple xywh string target", function () {
-            var annotation = {
+describe("annotationAdapter", () => {
+    describe("parseAnnotation", () => {
+        it("should correctly parse a simple xywh string target", () => {
+            const annotation = {
                 "@id": "http://example.org/anno1",
                 on: "http://example.org/image1#xywh=10,20,100,200",
                 label: "Test Annotation",
             };
-            var result = parseAnnotation(annotation, 0);
+            const result = parseAnnotation(annotation, 0);
             expect(result).not.toBeNull();
             if (!result)
                 return;
             expect(result.geometry.type).toBe("RECTANGLE");
-            var geometry = result.geometry;
+            const geometry = result.geometry;
             if ("x" in geometry) {
                 expect(geometry).toEqual({
                     type: "RECTANGLE",
@@ -27,8 +27,8 @@ describe("annotationAdapter", function () {
                 throw new Error("Geometry should be RECTANGLE type with x, y, w, h");
             }
         });
-        it("should extract SVG selector geometry", function () {
-            var annotation = {
+        it("should extract SVG selector geometry", () => {
+            const annotation = {
                 "@id": "http://example.org/anno2",
                 on: {
                     selector: {
@@ -37,12 +37,12 @@ describe("annotationAdapter", function () {
                     },
                 },
             };
-            var result = parseAnnotation(annotation, 1);
+            const result = parseAnnotation(annotation, 1);
             expect(result).not.toBeNull();
             if (!result)
                 return;
             expect(result.geometry.type).toBe("POLYGON");
-            var geometry = result.geometry;
+            const geometry = result.geometry;
             if ("points" in geometry) {
                 expect(geometry.points).toHaveLength(4);
                 expect(geometry.points).toEqual([
@@ -56,18 +56,18 @@ describe("annotationAdapter", function () {
                 throw new Error("Geometry should be POLYGON type with points");
             }
         });
-        it("should handle Manifesto-style getTarget and getId methods", function () {
-            var mockManifestoAnno = {
-                getId: function () { return "http://example.org/manifesto-anno"; },
-                getTarget: function () { return "http://example.org/canvas1#xywh=5,5,50,50"; },
-                getBody: function () { return [
-                    { getValue: function () { return "Manifesto Body"; }, getFormat: function () { return "text/plain"; } },
-                ]; },
+        it("should handle Manifesto-style getTarget and getId methods", () => {
+            const mockManifestoAnno = {
+                getId: () => "http://example.org/manifesto-anno",
+                getTarget: () => "http://example.org/canvas1#xywh=5,5,50,50",
+                getBody: () => [
+                    { getValue: () => "Manifesto Body", getFormat: () => "text/plain" },
+                ],
             };
             // @ts-ignore - mocking complex object
-            var result = parseAnnotation(mockManifestoAnno, 2);
-            expect(result === null || result === void 0 ? void 0 : result.id).toBe("http://example.org/manifesto-anno");
-            var geometry = result === null || result === void 0 ? void 0 : result.geometry;
+            const result = parseAnnotation(mockManifestoAnno, 2);
+            expect(result?.id).toBe("http://example.org/manifesto-anno");
+            const geometry = result?.geometry;
             if (geometry && "x" in geometry) {
                 expect(geometry).toMatchObject({
                     type: "RECTANGLE",
@@ -77,14 +77,14 @@ describe("annotationAdapter", function () {
                     h: 50,
                 });
             }
-            expect(result === null || result === void 0 ? void 0 : result.body.value).toBe("Manifesto Body");
+            expect(result?.body.value).toBe("Manifesto Body");
         });
-        it("should return null for invalid annotations with no geometry", function () {
-            var invalidAnno = {
+        it("should return null for invalid annotations with no geometry", () => {
+            const invalidAnno = {
                 "@id": "bad-anno",
                 on: "http://example.org/canvas1", // No media fragment or selector
             };
-            var result = parseAnnotation(invalidAnno, 3);
+            const result = parseAnnotation(invalidAnno, 3);
             expect(result).toBeNull();
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "triiiceratops",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "type": "module",
   "repository": {
     "type": "git",
@@ -59,7 +59,6 @@
     "@types/openseadragon": "^5.0.1",
     "happy-dom": "^20.0.11",
     "jsdom": "^27.3.0",
-    "phosphor-svelte": "^3.0.1",
     "prettier": "^3.7.4",
     "prettier-plugin-svelte": "^3.4.0",
     "svelte": "^5.43.8",
@@ -74,12 +73,13 @@
     "daisyui": "^5.5.8",
     "manifesto.js": "^4.3.0",
     "openseadragon": "^5.0.1",
+    "phosphor-svelte": "^3.0.1",
     "tailwindcss": "^4.1.17"
   },
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "build:lib": "svelte-package && vite build --config vite.config.lib.ts",
+    "build:lib": "svelte-package --tsconfig ./tsconfig.app.json && vite build --config vite.config.lib.ts",
     "build:element": "vite build --config vite.config.element.ts",
     "build:demo": "vite build --config vite.config.demo.ts",
     "build:consumer": "vite build --config vite.config.demo-consumer.ts",