@genome-spy/core 0.17.0 → 0.18.0

package/dist/{genome-spy-schema.json → schema.json}

@@ -2851,6 +2851,9 @@
         {
           "additionalProperties": false,
           "properties": {
+            "$schema": {
+              "type": "string"
+            },
             "aggregateSamples": {
               "items": {
                 "anyOf": [
@@ -3010,6 +3013,9 @@
         {
           "additionalProperties": false,
           "properties": {
+            "$schema": {
+              "type": "string"
+            },
             "aggregateSamples": {
               "items": {
                 "anyOf": [
@@ -3172,6 +3178,9 @@
         {
           "additionalProperties": false,
           "properties": {
+            "$schema": {
+              "type": "string"
+            },
             "baseUrl": {
               "type": "string"
             },
@@ -3322,6 +3331,9 @@
         {
           "additionalProperties": false,
           "properties": {
+            "$schema": {
+              "type": "string"
+            },
             "baseUrl": {
               "type": "string"
             },
@@ -3471,6 +3483,9 @@
         {
           "additionalProperties": false,
           "properties": {
+            "$schema": {
+              "type": "string"
+            },
             "baseUrl": {
               "type": "string"
             },
@@ -3620,6 +3635,9 @@
         {
           "additionalProperties": false,
           "properties": {
+            "$schema": {
+              "type": "string"
+            },
             "baseUrl": {
               "type": "string"
             },

package/package.json

@@ -7,12 +7,13 @@
   },
   "contributors": [],
   "license": "BSD-2-Clause",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "main": "dist/index.js",
   "module": "src/index.js",
   "exports": {
     ".": "./src/index.js",
-    "./*": "./src/*"
+    "./*": "./src/*",
+    "./schema.json": "./dist/schema.json"
   },
   "files": [
     "dist/",
@@ -20,16 +21,16 @@
   ],
   "repository": {
     "type": "git",
-    "url": "github:tuner/genome-spy",
+    "url": "github:genome-spy/genome-spy",
     "directory": "packages/core"
   },
   "scripts": {
     "dev": "node dev-server.js",
-    "build": "vite build",
-    "prepublishOnly": "npm run build && npm run build:schema",
+    "build": "vite build && npm run build:schema",
+    "prepublishOnly": "npm run build",
     "test:tsc": "tsc -p tsconfig.json",
     "checkSpec": "tsc --allowJs --checkJs --strict --noEmit --moduleResolution node --target es6 src/spec/root.d.ts",
-    "build:schema": "mkdir -p dist && ts-json-schema-generator --path 'src/spec/*.ts' --type RootSpec > dist/genome-spy-schema.json"
+    "build:schema": "mkdir -p dist && ts-json-schema-generator --path 'src/spec/*.ts' --type RootSpec > dist/schema.json"
   },
   "dependencies": {
     "@types/d3-array": "^3.0.2",
@@ -51,5 +52,5 @@
     "vega-scale": "^7.1.1",
     "vega-util": "^1.16.0"
   },
-  "gitHead": "32db7f46f77206140bd624344e9465d32a94bd07"
+  "gitHead": "ae445fc90ed7640ad9c3b39e81560d81126ebbeb"
 }

package/src/spec/root.d.ts

@@ -2,6 +2,8 @@ import { GenomeConfig } from "./genome";
 import { ViewSpec } from "./view";
 
 interface RootConfig {
+    $schema?: string;
+
     genome?: GenomeConfig;
 
     baseUrl?: string;

package/src/utils/addBaseUrl.js

@@ -0,0 +1,19 @@
+/**
+ * @param {string} url
+ * @param {string} baseUrl
+ */
+export default function addBaseUrl(url, baseUrl) {
+    // Regex copied from vega-loader
+    if (!baseUrl || /^(data:|([A-Za-z]+:)?\/\/)/.test(url)) {
+        return url;
+    }
+
+    if (!url.startsWith("/")) {
+        if (!baseUrl.endsWith("/")) {
+            baseUrl += "/";
+        }
+        return baseUrl + url;
+    }
+
+    return url;
+}

package/src/utils/addBaseUrl.test.js

@@ -0,0 +1,21 @@
+import addBaseUrl from "./addBaseUrl";
+
+test("addBaseUrl adds baseUrl when needed", () => {
+    expect(addBaseUrl("foo.html", "https://site.com/")).toEqual(
+        "https://site.com/foo.html"
+    );
+    expect(addBaseUrl("foo.html", "https://site.com")).toEqual(
+        "https://site.com/foo.html"
+    );
+    expect(addBaseUrl("bar/foo.html", "https://site.com/")).toEqual(
+        "https://site.com/bar/foo.html"
+    );
+    expect(addBaseUrl("../foo.html", "https://site.com/bar/")).toEqual(
+        "https://site.com/bar/../foo.html"
+    );
+});
+
+test("addBaseUrl doesn't add baseUrl when not needed", () => {
+    expect(addBaseUrl("/foo.html", "https://site.com/")).toEqual("/foo.html");
+    expect(addBaseUrl("foo.html", undefined)).toEqual("foo.html");
+});