@vizabi/reader-ddfcsv 4.5.6 → 4.6.0

package/lib/src/file-readers/github-path-adapter.js

@@ -6,36 +6,29 @@ function githubPathAdapter(path) {
     const githubcom = 'https://github.com/';
     const datapackage = '/datapackage.json';
     const dotgit = '.git';
-    const howManySlashes = (str) => (str.match(/\//g) || []).length;
+    if (path.endsWith(datapackage)) {
+        path = path.replace(datapackage, '');
+    }
+    if (path.endsWith('/')) {
+        path = path.replace(/.$/, '');
+    }
     if (path.startsWith(githubusercontent)) {
-        if (path.endsWith(datapackage)) {
-            path = path.replace(datapackage, '');
-        }
-        if (path.endsWith('/')) {
-            path = path.replace(/.$/, '');
-        }
-        if (howManySlashes(path) === 4) {
-            path = path + '/master';
-        }
         return path;
     }
     else if (path.startsWith(githubcom)) {
         if (path.endsWith(dotgit)) {
             path = path.replace(dotgit, '');
         }
-        if (path.endsWith(datapackage)) {
-            path = path.replace(datapackage, '');
-        }
-        if (path.endsWith('/')) {
-            path = path.replace(/.$/, '');
+        if (!path.includes('/blob') && !path.includes('/tree')) {
+            path = path + '/tree/master';
         }
-        path = path.replace(githubcom, githubusercontent);
         if (path.includes('/blob')) {
-            path = path.replace('/blob', '');
+            path = path.replace('/blob', '/refs/heads');
         }
-        if (howManySlashes(path) === 4) {
-            path = path + '/master';
+        if (path.includes('/tree')) {
+            path = path.replace('/tree', '/refs/heads');
         }
+        path = path.replace(githubcom, githubusercontent);
         return path;
     }
     else {

package/lib/src/file-readers/github-path-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"github-path-adapter.js","sourceRoot":"","sources":["../../../src/file-readers/github-path-adapter.ts"],"names":[],"mappings":";;AAAA,8CAoDC;AApDD,SAAgB,iBAAiB,CAAC,IAAY;IAU5C,MAAM,iBAAiB,GAAG,oCAAoC,CAAC;IAC/D,MAAM,SAAS,GAAG,qBAAqB,CAAC;IACxC,MAAM,WAAW,GAAG,mBAAmB,CAAC;IACxC,MAAM,MAAM,GAAG,MAAM,CAAC;IACtB,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;IAExE,IAAI,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACvC,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC;QAC1B,CAAC;QACD,OAAO,IAAI,CAAC;IAEd,CAAC;SAAM,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACtC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAChC,CAAC;QAED,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;QAElD,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC;QAC1B,CAAC;QACD,OAAO,IAAI,CAAC;IAEd,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"github-path-adapter.js","sourceRoot":"","sources":["../../../src/file-readers/github-path-adapter.ts"],"names":[],"mappings":";;AAwBA,8CAoCC;AApCD,SAAgB,iBAAiB,CAAC,IAAY;IAE5C,MAAM,iBAAiB,GAAG,oCAAoC,CAAC;IAC/D,MAAM,SAAS,GAAG,qBAAqB,CAAC;IACxC,MAAM,WAAW,GAAG,mBAAmB,CAAC;IACxC,MAAM,MAAM,GAAG,MAAM,CAAC;IAEtB,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAChC,CAAC;IAED,IAAI,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;SAAM,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACtC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACvD,IAAI,GAAG,IAAI,GAAG,cAAc,CAAC;QAC/B,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;QAElD,OAAO,IAAI,CAAC;IAEd,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}

package/lib/src/index.js

@@ -11,7 +11,7 @@ var ddfcsv_reader_2 = require("./ddfcsv-reader");
 Object.defineProperty(exports, "prepareDDFCsvReaderObject", { enumerable: true, get: function () { return ddfcsv_reader_2.prepareDDFCsvReaderObject; } });
 exports.getDDFCsvReaderObject = (0, ddfcsv_reader_1.prepareDDFCsvReaderObject)(new backend_file_reader_1.BackendFileReader());
 const __VERSION = '4.5.6';
-const __BUILD = '1771890089880';
+const __BUILD = '1773755931243';
 const __PACKAGE_JSON_FIELDS = {"name":"@vizabi/reader-ddfcsv","description":"Vizabi DDFcsv reader"};
 exports.versionInfo = { version: __VERSION, build: __BUILD, package: __PACKAGE_JSON_FIELDS };
 exports.version = __VERSION;

package/lib-web/src/file-readers/github-path-adapter.js

@@ -3,36 +3,29 @@ export function githubPathAdapter(path) {
     const githubcom = 'https://github.com/';
     const datapackage = '/datapackage.json';
     const dotgit = '.git';
-    const howManySlashes = (str) => (str.match(/\//g) || []).length;
+    if (path.endsWith(datapackage)) {
+        path = path.replace(datapackage, '');
+    }
+    if (path.endsWith('/')) {
+        path = path.replace(/.$/, '');
+    }
     if (path.startsWith(githubusercontent)) {
-        if (path.endsWith(datapackage)) {
-            path = path.replace(datapackage, '');
-        }
-        if (path.endsWith('/')) {
-            path = path.replace(/.$/, '');
-        }
-        if (howManySlashes(path) === 4) {
-            path = path + '/master';
-        }
         return path;
     }
     else if (path.startsWith(githubcom)) {
         if (path.endsWith(dotgit)) {
             path = path.replace(dotgit, '');
         }
-        if (path.endsWith(datapackage)) {
-            path = path.replace(datapackage, '');
-        }
-        if (path.endsWith('/')) {
-            path = path.replace(/.$/, '');
+        if (!path.includes('/blob') && !path.includes('/tree')) {
+            path = path + '/tree/master';
         }
-        path = path.replace(githubcom, githubusercontent);
         if (path.includes('/blob')) {
-            path = path.replace('/blob', '');
+            path = path.replace('/blob', '/refs/heads');
         }
-        if (howManySlashes(path) === 4) {
-            path = path + '/master';
+        if (path.includes('/tree')) {
+            path = path.replace('/tree', '/refs/heads');
         }
+        path = path.replace(githubcom, githubusercontent);
         return path;
     }
     else {

package/lib-web/src/file-readers/github-path-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"github-path-adapter.js","sourceRoot":"","sources":["../../../src/file-readers/github-path-adapter.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAU5C,MAAM,iBAAiB,GAAG,oCAAoC,CAAC;IAC/D,MAAM,SAAS,GAAG,qBAAqB,CAAC;IACxC,MAAM,WAAW,GAAG,mBAAmB,CAAC;IACxC,MAAM,MAAM,GAAG,MAAM,CAAC;IACtB,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;IAExE,IAAI,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACvC,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC;QAC1B,CAAC;QACD,OAAO,IAAI,CAAC;IAEd,CAAC;SAAM,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACtC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAChC,CAAC;QAED,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;QAElD,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC;QAC1B,CAAC;QACD,OAAO,IAAI,CAAC;IAEd,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"github-path-adapter.js","sourceRoot":"","sources":["../../../src/file-readers/github-path-adapter.ts"],"names":[],"mappings":"AAwBA,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAE5C,MAAM,iBAAiB,GAAG,oCAAoC,CAAC;IAC/D,MAAM,SAAS,GAAG,qBAAqB,CAAC;IACxC,MAAM,WAAW,GAAG,mBAAmB,CAAC;IACxC,MAAM,MAAM,GAAG,MAAM,CAAC;IAEtB,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAChC,CAAC;IAED,IAAI,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;SAAM,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACtC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACvD,IAAI,GAAG,IAAI,GAAG,cAAc,CAAC;QAC/B,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;QAElD,OAAO,IAAI,CAAC;IAEd,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}

package/lib-web/src/index-web.js

@@ -4,7 +4,7 @@ export { DdfCsvError } from './ddfcsv-error';
 import { prepareDDFCsvReaderObject } from './ddfcsv-reader';
 export const getDDFCsvReaderObject = prepareDDFCsvReaderObject(new FrontendFileReader());
 const __VERSION = '4.5.6';
-const __BUILD = '1771890078305';
+const __BUILD = '1773755928822';
 const __PACKAGE_JSON_FIELDS = {"name":"@vizabi/reader-ddfcsv","description":"Vizabi DDFcsv reader"};
 export const versionInfo = { version: __VERSION, build: __BUILD, package: __PACKAGE_JSON_FIELDS };
 export const version = __VERSION;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizabi/reader-ddfcsv",
-  "version": "4.5.6",
+  "version": "4.6.0",
   "description": "Vizabi DDFcsv reader",
   "author": "Vyacheslav Chub<vyacheslav.chub@valor-software.com>",
   "license": "GPL-3.0",
@@ -53,7 +53,9 @@
     "instrument": true
   },
   "mocha": {
-    "node-option": ["import=tsx"],
+    "node-option": [
+      "import=tsx"
+    ],
     "require": [
       "source-map-support/register"
     ],

package/src/file-readers/github-path-adapter.ts

@@ -1,50 +1,58 @@
+  /*
+  normalised paths should look like this:
+  https://raw.githubusercontent.com/open-numbers/repository/refs/heads/branch - for github only, no trailing slahs, no filename in the end
+  https://domain.com/path/ddf--gapminder--systema_globalis - for any other host
+ 
+  examples of supported cases
+  custom hosting
+  https://domain.com/path/ddf--gapminder--systema_globalis - not github and not at githubusercontent, left as is
+  https://domain.com/path/ddf--gapminder--systema_globalis/ - trailing slash removed
+  https://domain.com/path/ddf--gapminder--systema_globalis/datapackage.json - datapackage file in the end removed
+ 
+  githubusercontent prefix
+  https://raw.githubusercontent.com/open-numbers/ddf--gapminder--systema_globalis/refs/heads/develop - already good
+  https://raw.githubusercontent.com/open-numbers/ddf--gapminder--systema_globalis/refs/heads/develop/datapackage.json - datapackage file in the end
+  https://raw.githubusercontent.com/open-numbers/ddf--gapminder--systema_globalis/refs/heads/develop/ - trailing slash
+ 
+  github prefix
+  https://github.com/open-numbers/ddf--gapminder--systema_globalis - plain, possible trailing slash, assumes master branch
+  https://github.com/open-numbers/ddf--gapminder--systema_globalis.git - with .git, assumes master branch
+  https://github.com/open-numbers/ddf--gapminder--systema_globalis/tree/develop - with branch, possible trailing slash
+  https://github.com/open-numbers/ddf--gapminder--systema_globalis/blob/develop/datapackage.json - blob and specific file
+ 
+  */
+
 export function githubPathAdapter(path: string) {
-  // examples of supported cases
-  // https://raw.githubusercontent.com/open-numbers/ddf--open_numbers--world_development_indicators/master
-  // https://raw.githubusercontent.com/open-numbers/ddf--open_numbers--world_development_indicators/master/
-  // https://raw.githubusercontent.com/open-numbers/ddf--open_numbers--world_development_indicators/master/datapackage.json
 
-  // assumes master branch
-  // https://github.com/open-numbers/ddf--open_numbers--world_development_indicators
-  // https://github.com/open-numbers/ddf--open_numbers--world_development_indicators.git
-  // https://github.com/open-numbers/ddf--open_numbers--world_development_indicators/blob/master/datapackage.json
   const githubusercontent = 'https://raw.githubusercontent.com/';
   const githubcom = 'https://github.com/';
   const datapackage = '/datapackage.json';
   const dotgit = '.git';
-  const howManySlashes = (str: string) => (str.match(/\//g) || []).length;
+
+  if (path.endsWith(datapackage)) {
+    path = path.replace(datapackage, '');
+  }
+  if (path.endsWith('/')) {
+    path = path.replace(/.$/, ''); // remove trailing slash
+  }
 
   if (path.startsWith(githubusercontent)) {
-    if (path.endsWith(datapackage)) {
-      path = path.replace(datapackage, '');
-    }
-    if (path.endsWith('/')) {
-      path = path.replace(/.$/, ''); // remove trailing slash
-    }
-    if (howManySlashes(path) === 4) {
-      path = path + '/master';
-    }
     return path;
-
   } else if (path.startsWith(githubcom)) {
     if (path.endsWith(dotgit)) {
       path = path.replace(dotgit, '');
     }
-    if (path.endsWith(datapackage)) {
-      path = path.replace(datapackage, '');
-    }
-    if (path.endsWith('/')) {
-      path = path.replace(/.$/, ''); // remove trailing slash
+    if (!path.includes('/blob') && !path.includes('/tree')) {
+      path = path + '/tree/master'; // assume master branch if none specified
     }
-
-    path = path.replace(githubcom, githubusercontent);
-
     if (path.includes('/blob')) {
-      path = path.replace('/blob', '');
+      path = path.replace('/blob', '/refs/heads'); // replace blob with refs/heads 
     }
-    if (howManySlashes(path) === 4) {
-      path = path + '/master';
+    if (path.includes('/tree')) {
+      path = path.replace('/tree', '/refs/heads'); // replace tree with refs/heads 
     }
+    path = path.replace(githubcom, githubusercontent);
+
     return path;
 
   } else {

package/.nyc_output/ae4f8c65-5783-43ab-bcc5-c411d8c75ff8.json

@@ -1 +0,0 @@
-{}