@hpcc-js/ddl-shim 2.17.16 → 2.17.20

package/dist/index.js

@@ -5,8 +5,8 @@
 }(this, (function (exports) { 'use strict';
 
     var PKG_NAME = "@hpcc-js/ddl-shim";
-    var PKG_VERSION = "2.17.16";
-    var BUILD_VERSION = "2.71.0";
+    var PKG_VERSION = "2.17.20";
+    var BUILD_VERSION = "2.94.0";
 
     function isWorkunitDatasource(ref) {
         return ref.WUID !== undefined;
@@ -1100,7 +1100,7 @@
     }
 
     var uri_all = createCommonjsModule(function (module, exports) {
-    /** @license URI.js v4.2.1 (c) 2011 Gary Court. License: http://github.com/garycourt/uri-js */
+    /** @license URI.js v4.4.1 (c) 2011 Gary Court. License: http://github.com/garycourt/uri-js */
     (function (global, factory) {
     	 factory(exports) ;
     }(commonjsGlobal, (function (exports) {
@@ -2023,9 +2023,9 @@
                 return "[" + $1 + ($2 ? "%25" + $2 : "") + "]";
             }));
         }
-        if (typeof components.port === "number") {
+        if (typeof components.port === "number" || typeof components.port === "string") {
             uriTokens.push(":");
-            uriTokens.push(components.port.toString(10));
+            uriTokens.push(String(components.port));
         }
         return uriTokens.length ? uriTokens.join("") : undefined;
     }
@@ -2228,8 +2228,9 @@
             return components;
         },
         serialize: function serialize(components, options) {
+            var secure = String(components.scheme).toLowerCase() === "https";
             //normalize the default port
-            if (components.port === (String(components.scheme).toLowerCase() !== "https" ? 80 : 443) || components.port === "") {
+            if (components.port === (secure ? 443 : 80) || components.port === "") {
                 components.port = undefined;
             }
             //normalize the empty path
@@ -2250,6 +2251,57 @@
         serialize: handler.serialize
     };
 
+    function isSecure(wsComponents) {
+        return typeof wsComponents.secure === 'boolean' ? wsComponents.secure : String(wsComponents.scheme).toLowerCase() === "wss";
+    }
+    //RFC 6455
+    var handler$2 = {
+        scheme: "ws",
+        domainHost: true,
+        parse: function parse(components, options) {
+            var wsComponents = components;
+            //indicate if the secure flag is set
+            wsComponents.secure = isSecure(wsComponents);
+            //construct resouce name
+            wsComponents.resourceName = (wsComponents.path || '/') + (wsComponents.query ? '?' + wsComponents.query : '');
+            wsComponents.path = undefined;
+            wsComponents.query = undefined;
+            return wsComponents;
+        },
+        serialize: function serialize(wsComponents, options) {
+            //normalize the default port
+            if (wsComponents.port === (isSecure(wsComponents) ? 443 : 80) || wsComponents.port === "") {
+                wsComponents.port = undefined;
+            }
+            //ensure scheme matches secure flag
+            if (typeof wsComponents.secure === 'boolean') {
+                wsComponents.scheme = wsComponents.secure ? 'wss' : 'ws';
+                wsComponents.secure = undefined;
+            }
+            //reconstruct path from resource name
+            if (wsComponents.resourceName) {
+                var _wsComponents$resourc = wsComponents.resourceName.split('?'),
+                    _wsComponents$resourc2 = slicedToArray(_wsComponents$resourc, 2),
+                    path = _wsComponents$resourc2[0],
+                    query = _wsComponents$resourc2[1];
+
+                wsComponents.path = path && path !== '/' ? path : undefined;
+                wsComponents.query = query;
+                wsComponents.resourceName = undefined;
+            }
+            //forbid fragment component
+            wsComponents.fragment = undefined;
+            return wsComponents;
+        }
+    };
+
+    var handler$3 = {
+        scheme: "wss",
+        domainHost: handler$2.domainHost,
+        parse: handler$2.parse,
+        serialize: handler$2.serialize
+    };
+
     var O = {};
     //RFC 3986
     var UNRESERVED$$ = "[A-Za-z0-9\\-\\.\\_\\~" + ( "\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF" ) + "]";
@@ -2279,7 +2331,7 @@
         var decStr = pctDecChars(str);
         return !decStr.match(UNRESERVED) ? str : decStr;
     }
-    var handler$2 = {
+    var handler$4 = {
         scheme: "mailto",
         parse: function parse$$1(components, options) {
             var mailtoComponents = components;
@@ -2367,7 +2419,7 @@
 
     var URN_PARSE = /^([^\:]+)\:(.*)/;
     //RFC 2141
-    var handler$3 = {
+    var handler$5 = {
         scheme: "urn",
         parse: function parse$$1(components, options) {
             var matches = components.path && components.path.match(URN_PARSE);
@@ -2406,7 +2458,7 @@
 
     var UUID = /^[0-9A-Fa-f]{8}(?:\-[0-9A-Fa-f]{4}){3}\-[0-9A-Fa-f]{12}$/;
     //RFC 4122
-    var handler$4 = {
+    var handler$6 = {
         scheme: "urn:uuid",
         parse: function parse(urnComponents, options) {
             var uuidComponents = urnComponents;
@@ -2430,6 +2482,8 @@
     SCHEMES[handler$2.scheme] = handler$2;
     SCHEMES[handler$3.scheme] = handler$3;
     SCHEMES[handler$4.scheme] = handler$4;
+    SCHEMES[handler$5.scheme] = handler$5;
+    SCHEMES[handler$6.scheme] = handler$6;
 
     exports.SCHEMES = SCHEMES;
     exports.pctEncChar = pctEncChar;