@hpcc-js/observablehq-compiler 1.2.3 → 1.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/observablehq-compiler",
-    "version": "1.2.3",
+    "version": "1.2.5",
     "description": "hpcc-js - ObservableHQ Compiler (unoffical)",
     "keywords": [
         "observablehq",
@@ -57,13 +57,13 @@
     },
     "dependencies": {
         "@hpcc-js/observable-shim": "^2.5.0",
-        "node-fetch": "3.2.10",
-        "yargs": "17.6.0"
+        "node-fetch": "3.3.0",
+        "yargs": "17.6.2"
     },
     "devDependencies": {
         "@hpcc-js/bundle": "^2.11.3",
         "@observablehq/runtime": "4.28.0",
-        "tslib": "2.4.0"
+        "tslib": "2.4.1"
     },
     "repository": {
         "type": "git",
@@ -76,5 +76,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization/tree/trunk/packages/observablehq-compiler",
-    "gitHead": "b5b4cf9ee4257885b41a3f90c11cbe6609704d0d"
+    "gitHead": "c384273a6173ffe20db065979e0b76049099ef38"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/observablehq-compiler";
-export const PKG_VERSION = "1.2.3";
-export const BUILD_VERSION = "2.104.13";
+export const PKG_VERSION = "1.2.5";
+export const BUILD_VERSION = "2.104.15";

package/src/util.ts

@@ -157,26 +157,20 @@ export function omd2notebook(omd: string): ohq.Notebook {
     } as ohq.Notebook;
 }
 
-export function fetchEx(url: string, proxyPrefix = "https://observable-cors.glitch.me/", proxyPostfix = "") {
-    return fetch(url)
-        .then(response => {
-            if (response.ok) return response;
-            throw new Error("CORS?");
-        }).catch(e => {
-            const matches = url.match(/^(?:https?:\/\/)?(?:[^@\n]+@)?(?:www\.)?([^:\/\n?]+)/img);
-            url = `${proxyPrefix}${url}${proxyPostfix}`;
-            return fetch(url, {
-                headers: {
-                    origin: matches[0],
-                    referer: url
-                }
-            });
-        });
+export function fetchEx(url: string, proxyPrefix = "https://api.codetabs.com/v1/proxy/?quest=", proxyPostfix = "") {
+    const matches = url.match(/^(?:https?:\/\/)?(?:[^@\n]+@)?(?:www\.)?([^:\/\n?]+)/img);
+    return fetch(url, { headers: { origin: matches[0], referer: url } }).then(response => {
+        if (response.ok) return response;
+        throw new Error("CORS?");
+    }).catch(e => {
+        url = `${proxyPrefix}${url}${proxyPostfix}`;
+        return fetch(url, { headers: { origin: matches[0], referer: url } });
+    });
 }
 
-export function download(impUrl: string): Promise<ohq.Notebook> {
+export function download(impUrl: string, proxyPrefix?: string, proxyPostfix?: string): Promise<ohq.Notebook> {
     const isShared = impUrl.indexOf("https://observablehq.com/d") === 0;
-    return fetchEx(impUrl.replace(`https://observablehq.com/${isShared ? "d/" : ""}`, "https://api.observablehq.com/document/"))
+    return fetchEx(impUrl.replace(`https://observablehq.com/${isShared ? "d/" : ""}`, "https://api.observablehq.com/document/"), proxyPrefix, proxyPostfix)
         .then(r => r.json())
         ;
 }

package/types/__package__.d.ts

@@ -1,4 +1,4 @@
 export declare const PKG_NAME = "@hpcc-js/observablehq-compiler";
-export declare const PKG_VERSION = "1.2.3";
-export declare const BUILD_VERSION = "2.104.13";
+export declare const PKG_VERSION = "1.2.5";
+export declare const BUILD_VERSION = "2.104.15";
 //# sourceMappingURL=__package__.d.ts.map

package/types/util.d.ts

@@ -25,6 +25,6 @@ export declare function notebook2ojs(_: string): ParsedOJS[];
 export declare function ojs2notebook(ojs: string): ohq.Notebook;
 export declare function omd2notebook(omd: string): ohq.Notebook;
 export declare function fetchEx(url: string, proxyPrefix?: string, proxyPostfix?: string): Promise<Response>;
-export declare function download(impUrl: string): Promise<ohq.Notebook>;
+export declare function download(impUrl: string, proxyPrefix?: string, proxyPostfix?: string): Promise<ohq.Notebook>;
 export {};
 //# sourceMappingURL=util.d.ts.map

package/types/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAiBpD,UAAU,GAAG;IACT,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,IAAI;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;CAClB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,UAAQ,EAAE,SAAS,UAAQ,EAAE,cAAc,UAAQ,EAAE,IAAI,CAAC,EAAE,MAAM,OAYjH;AAQD,eAAO,MAAM,cAAc,SAAU,MAAM,YAAoB,CAAC;AAChE,eAAO,MAAM,cAAc,SAAU,MAAM,YAAY,MAAM,QAK5D,CAAC;AAGF,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,gBAEjD;AAED,UAAU,SAAS;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,GAAG,CAAC;IACV,KAAK,EAAE,GAAG,CAAC;CACd;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,UAIzC;AAgDD,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,CAGnD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ,CActD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ,CActD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,SAAuC,EAAE,YAAY,SAAK,qBAezG;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAK9D"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAiBpD,UAAU,GAAG;IACT,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,IAAI;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;CAClB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,UAAQ,EAAE,SAAS,UAAQ,EAAE,cAAc,UAAQ,EAAE,IAAI,CAAC,EAAE,MAAM,OAYjH;AAQD,eAAO,MAAM,cAAc,SAAU,MAAM,YAAoB,CAAC;AAChE,eAAO,MAAM,cAAc,SAAU,MAAM,YAAY,MAAM,QAK5D,CAAC;AAGF,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,gBAEjD;AAED,UAAU,SAAS;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,GAAG,CAAC;IACV,KAAK,EAAE,GAAG,CAAC;CACd;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,UAIzC;AAgDD,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,CAGnD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ,CActD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ,CActD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,SAA8C,EAAE,YAAY,SAAK,qBAShH;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAK3G"}

package/types-3.4/__package__.d.ts

@@ -1,4 +1,4 @@
 export declare const PKG_NAME = "@hpcc-js/observablehq-compiler";
-export declare const PKG_VERSION = "1.2.3";
-export declare const BUILD_VERSION = "2.104.13";
+export declare const PKG_VERSION = "1.2.5";
+export declare const BUILD_VERSION = "2.104.15";
 //# sourceMappingURL=__package__.d.ts.map

package/types-3.4/util.d.ts

@@ -25,6 +25,6 @@ export declare function notebook2ojs(_: string): ParsedOJS[];
 export declare function ojs2notebook(ojs: string): ohq.Notebook;
 export declare function omd2notebook(omd: string): ohq.Notebook;
 export declare function fetchEx(url: string, proxyPrefix?: string, proxyPostfix?: string): Promise<Response>;
-export declare function download(impUrl: string): Promise<ohq.Notebook>;
+export declare function download(impUrl: string, proxyPrefix?: string, proxyPostfix?: string): Promise<ohq.Notebook>;
 export {};
 //# sourceMappingURL=util.d.ts.map