@magda/typescript-common 3.0.2-alpha.0 → 3.0.2-alpha.1

package/dist/getStorageApiResourceAccessUrl.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Get the access url of a storage api resource from [pseudo storage api resource URL](https://github.com/magda-io/magda/issues/3000)
+ * If the input url is not a pseudo storage api resource URL, return the input url directly
+ *
+ * @export
+ * @param {string} resourceUrl pseudo storage api resource URL or ordinary HTTP access url
+ * @param {string} storageApiBaseUrl storage api base url
+ * @param {string} datasetsBucket datasets storage bucket name
+ * @return {*}
+ */
+export default function getStorageApiResourceAccessUrl(resourceUrl: string, storageApiBaseUrl: string, datasetsBucket: string): string;

package/dist/getStorageApiResourceAccessUrl.js

@@ -0,0 +1,37 @@
+import urijs from "urijs";
+/**
+ * Get the access url of a storage api resource from [pseudo storage api resource URL](https://github.com/magda-io/magda/issues/3000)
+ * If the input url is not a pseudo storage api resource URL, return the input url directly
+ *
+ * @export
+ * @param {string} resourceUrl pseudo storage api resource URL or ordinary HTTP access url
+ * @param {string} storageApiBaseUrl storage api base url
+ * @param {string} datasetsBucket datasets storage bucket name
+ * @return {*}
+ */
+export default function getStorageApiResourceAccessUrl(resourceUrl, storageApiBaseUrl, datasetsBucket) {
+    if (!resourceUrl) {
+        return resourceUrl;
+    }
+    const uri = urijs(resourceUrl);
+    if (uri.protocol() === "magda" && uri.hostname() === "storage-api") {
+        // --- convert [pseudo storage api resource URL](https://github.com/magda-io/magda/issues/3000) to http access url
+        const [datasetId, distributionId, fileName] = uri.segmentCoded();
+        const accessUri = urijs(storageApiBaseUrl);
+        const segments = [
+            ...accessUri.segmentCoded(),
+            datasetsBucket,
+            datasetId,
+            distributionId,
+            fileName
+        ];
+        return accessUri.segmentCoded(segments).toString();
+    }
+    else {
+        // --- return legacy url directly
+        // --- legacy url is a HTTP access url generated when create the resource
+        // --- can be used to access storage api directly
+        return resourceUrl;
+    }
+}
+//# sourceMappingURL=getStorageApiResourceAccessUrl.js.map

package/dist/getStorageApiResourceAccessUrl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getStorageApiResourceAccessUrl.js","sourceRoot":"","sources":["../src/getStorageApiResourceAccessUrl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,UAAU,8BAA8B,CAClD,WAAmB,EACnB,iBAAyB,EACzB,cAAsB;IAEtB,IAAI,CAAC,WAAW,EAAE,CAAC;QACf,OAAO,WAAW,CAAC;IACvB,CAAC;IACD,MAAM,GAAG,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IAC/B,IAAI,GAAG,CAAC,QAAQ,EAAE,KAAK,OAAO,IAAI,GAAG,CAAC,QAAQ,EAAE,KAAK,aAAa,EAAE,CAAC;QACjE,kHAAkH;QAClH,MAAM,CAAC,SAAS,EAAE,cAAc,EAAE,QAAQ,CAAC,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;QACjE,MAAM,SAAS,GAAG,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG;YACb,GAAG,SAAS,CAAC,YAAY,EAAE;YAC3B,cAAc;YACd,SAAS;YACT,cAAc;YACd,QAAQ;SACX,CAAC;QACF,OAAO,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;IACvD,CAAC;SAAM,CAAC;QACJ,iCAAiC;QACjC,yEAAyE;QACzE,iDAAiD;QACjD,OAAO,WAAW,CAAC;IACvB,CAAC;AACL,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@magda/typescript-common",
   "description": "Common TypeScript code shared between components.",
-  "version": "3.0.2-alpha.0",
+  "version": "3.0.2-alpha.1",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
@@ -23,8 +23,8 @@
   },
   "devDependencies": {
     "@magda/esm-utils": "^1.0.1",
-    "@magda/registry-aspects": "^3.0.2-alpha.0",
-    "@magda/scripts": "^3.0.2-alpha.0",
+    "@magda/registry-aspects": "^3.0.2-alpha.1",
+    "@magda/scripts": "^3.0.2-alpha.1",
     "@types/chai": "^4.3.11",
     "@types/chai-as-promised": "^7.1.0",
     "@types/cross-spawn": "^6.0.1",