diff --git a/README.rst b/README.rst index 7af4171f..3e5e7b73 100644 --- a/README.rst +++ b/README.rst @@ -469,6 +469,7 @@ Release History +=========+============+==========================================================================================================+ | | | | Support custom admin sites. Contributed by #aboutofpluto | | | | | Fix date expression in a filter on a datetime field not anchoring to midnight. | +| | | | Use verbose names for apps and models. | +---------+------------+----------------------------------------------------------------------------------------------------------+ | 4.2.5 | 2023-07-20 | | Fix parsing of date/datetime strings like ``mon-1``. | | | | | Add support for DB query analyze via ``.analyze`` url, similar to the existing ``.explain``. | diff --git a/data_browser/fe_build/asset-manifest.json b/data_browser/fe_build/asset-manifest.json index 1de844f0..814bd40b 100644 --- a/data_browser/fe_build/asset-manifest.json +++ b/data_browser/fe_build/asset-manifest.json @@ -1,13 +1,13 @@ { "files": { "main.css": "./static/css/main.a2cd42f2.css", - "main.js": "./static/js/main.c57e8af0.js", + "main.js": "./static/js/main.0ec3d805.js", "index.html": "./index.html", "main.a2cd42f2.css.map": "./static/css/main.a2cd42f2.css.map", - "main.c57e8af0.js.map": "./static/js/main.c57e8af0.js.map" + "main.0ec3d805.js.map": "./static/js/main.0ec3d805.js.map" }, "entrypoints": [ "static/css/main.a2cd42f2.css", - "static/js/main.c57e8af0.js" + "static/js/main.0ec3d805.js" ] } \ No newline at end of file diff --git a/data_browser/fe_build/index.html b/data_browser/fe_build/index.html index 39dff2a9..1bb6d03e 100644 --- a/data_browser/fe_build/index.html +++ b/data_browser/fe_build/index.html @@ -1 +1 @@ -{% load static %}View{% block extrahead %} {% endblock %}{% block messages %} {% if messages %}{% endif %} {% endblock messages %}{% csrf_token %}
\ No newline at end of file +{% load static %}View{% block extrahead %} {% endblock %}{% block messages %} {% if messages %}{% endif %} {% endblock messages %}{% csrf_token %}
\ No newline at end of file diff --git a/data_browser/fe_build/static/js/main.c57e8af0.js b/data_browser/fe_build/static/js/main.0ec3d805.js similarity index 93% rename from data_browser/fe_build/static/js/main.c57e8af0.js rename to data_browser/fe_build/static/js/main.0ec3d805.js index 19bf9364..87a6aa6b 100644 --- a/data_browser/fe_build/static/js/main.c57e8af0.js +++ b/data_browser/fe_build/static/js/main.0ec3d805.js @@ -1,3 +1,3 @@ -/*! For license information please see main.c57e8af0.js.LICENSE.txt */ -!function(){var e={2968:function(e,t,n){"use strict";n.d(t,{R:function(){return i},Y:function(){return a}});var r=n(9509),o={};function i(){return(0,r.KV)()?n.g:"undefined"!==typeof window?window:"undefined"!==typeof self?self:o}function a(e,t,n){var r=n||i(),o=r.__SENTRY__=r.__SENTRY__||{};return o[e]||(o[e]=t())}},9509:function(e,t,n){"use strict";function r(){return!("undefined"!==typeof __SENTRY_BROWSER_BUNDLE__&&__SENTRY_BROWSER_BUNDLE__)&&"[object process]"===Object.prototype.toString.call("undefined"!==typeof process?process:0)}function o(e,t){return e.require(t)}n.d(t,{l$:function(){return o},KV:function(){return r}}),e=n.hmd(e)},9846:function(e,t,n){"use strict";n.d(t,{ph:function(){return s},yW:function(){return l}});var r=n(2968),o=n(9509);e=n.hmd(e);var i={nowSeconds:function(){return Date.now()/1e3}};var a=(0,o.KV)()?function(){try{return(0,o.l$)(e,"perf_hooks").performance}catch(t){return}}():function(){var e=(0,r.R)().performance;if(e&&e.now)return{now:function(){return e.now()},timeOrigin:Date.now()-e.now()}}(),u=void 0===a?i:{nowSeconds:function(){return(a.timeOrigin+a.now())/1e3}},l=i.nowSeconds.bind(i),s=u.nowSeconds.bind(u);!function(){var e=(0,r.R)().performance;if(e&&e.now){var t=36e5,n=e.now(),o=Date.now(),i=e.timeOrigin?Math.abs(e.timeOrigin+n-o):t,a=i1?n-1:0),o=1;o1?n-1:0),o=1;o1?n-1:0),o=1;o1?n-1:0),o=1;oe.length)&&(n=e.length),e.substring(n-t.length,n)===t}var y="",v="",m="",g="",b={deepStrictEqual:"Expected values to be strictly deep-equal:",strictEqual:"Expected values to be strictly equal:",strictEqualObject:'Expected "actual" to be reference-equal to "expected":',deepEqual:"Expected values to be loosely deep-equal:",equal:"Expected values to be loosely equal:",notDeepStrictEqual:'Expected "actual" not to be strictly deep-equal to:',notStrictEqual:'Expected "actual" to be strictly unequal to:',notStrictEqualObject:'Expected "actual" not to be reference-equal to "expected":',notDeepEqual:'Expected "actual" not to be loosely deep-equal to:',notEqual:'Expected "actual" to be loosely unequal to:',notIdentical:"Values identical but not reference-equal:"};function w(e){var t=Object.keys(e),n=Object.create(Object.getPrototypeOf(e));return t.forEach((function(t){n[t]=e[t]})),Object.defineProperty(n,"message",{value:e.message}),n}function x(e){return p(e,{compact:!1,customInspect:!1,depth:1e3,maxArrayLength:1/0,showHidden:!1,breakLength:1/0,showProxy:!1,sorted:!0,getters:!0})}function _(e,t,n){var r="",o="",i=0,a="",u=!1,l=x(e),s=l.split("\n"),c=x(t).split("\n"),p=0,d="";if("strictEqual"===n&&"object"===f(e)&&"object"===f(t)&&null!==e&&null!==t&&(n="strictEqualObject"),1===s.length&&1===c.length&&s[0]!==c[0]){var w=s[0].length+c[0].length;if(w<=10){if(("object"!==f(e)||null===e)&&("object"!==f(t)||null===t)&&(0!==e||0!==t))return"".concat(b[n],"\n\n")+"".concat(s[0]," !== ").concat(c[0],"\n")}else if("strictEqualObject"!==n){if(w<(process.stderr&&process.stderr.isTTY?process.stderr.columns:80)){for(;s[0][p]===c[0][p];)p++;p>2&&(d="\n ".concat(function(e,t){if(t=Math.floor(t),0==e.length||0==t)return"";var n=e.length*t;for(t=Math.floor(Math.log(t)/Math.log(2));t;)e+=e,t--;return e+e.substring(0,n-e.length)}(" ",p),"^"),p=0)}}}for(var _=s[s.length-1],S=c[c.length-1];_===S&&(p++<2?a="\n ".concat(_).concat(a):r=_,s.pop(),c.pop(),0!==s.length&&0!==c.length);)_=s[s.length-1],S=c[c.length-1];var E=Math.max(s.length,c.length);if(0===E){var k=l.split("\n");if(k.length>30)for(k[26]="".concat(y,"...").concat(g);k.length>27;)k.pop();return"".concat(b.notIdentical,"\n\n").concat(k.join("\n"),"\n")}p>3&&(a="\n".concat(y,"...").concat(g).concat(a),u=!0),""!==r&&(a="\n ".concat(r).concat(a),r="");var T=0,j=b[n]+"\n".concat(v,"+ actual").concat(g," ").concat(m,"- expected").concat(g),O=" ".concat(y,"...").concat(g," Lines skipped");for(p=0;p1&&p>2&&(P>4?(o+="\n".concat(y,"...").concat(g),u=!0):P>3&&(o+="\n ".concat(c[p-2]),T++),o+="\n ".concat(c[p-1]),T++),i=p,r+="\n".concat(m,"-").concat(g," ").concat(c[p]),T++;else if(c.length1&&p>2&&(P>4?(o+="\n".concat(y,"...").concat(g),u=!0):P>3&&(o+="\n ".concat(s[p-2]),T++),o+="\n ".concat(s[p-1]),T++),i=p,o+="\n".concat(v,"+").concat(g," ").concat(s[p]),T++;else{var C=c[p],N=s[p],R=N!==C&&(!h(N,",")||N.slice(0,-1)!==C);R&&h(C,",")&&C.slice(0,-1)===N&&(R=!1,N+=","),R?(P>1&&p>2&&(P>4?(o+="\n".concat(y,"...").concat(g),u=!0):P>3&&(o+="\n ".concat(s[p-2]),T++),o+="\n ".concat(s[p-1]),T++),i=p,o+="\n".concat(v,"+").concat(g," ").concat(N),r+="\n".concat(m,"-").concat(g," ").concat(C),T+=2):(o+=r,r="",1!==P&&0!==p||(o+="\n ".concat(N),T++))}if(T>20&&p30)for(S[26]="".concat(y,"...").concat(g);S.length>27;)S.pop();n=1===S.length?i(this,c(t).call(this,"".concat(h," ").concat(S[0]))):i(this,c(t).call(this,"".concat(h,"\n\n").concat(S.join("\n"),"\n")))}else{var E=x(l),k="",T=b[o];"notDeepEqual"===o||"notEqual"===o?(E="".concat(b[o],"\n\n").concat(E)).length>1024&&(E="".concat(E.slice(0,1021),"...")):(k="".concat(x(s)),E.length>512&&(E="".concat(E.slice(0,509),"...")),k.length>512&&(k="".concat(k.slice(0,509),"...")),"deepEqual"===o||"equal"===o?E="".concat(T,"\n\n").concat(E,"\n\nshould equal\n\n"):k=" ".concat(o," ").concat(k)),n=i(this,c(t).call(this,"".concat(E).concat(k)))}return Error.stackTraceLimit=p,n.generatedMessage=!r,Object.defineProperty(a(n),"name",{value:"AssertionError [ERR_ASSERTION]",enumerable:!1,writable:!0,configurable:!0}),n.code="ERR_ASSERTION",n.actual=l,n.expected=s,n.operator=o,Error.captureStackTrace&&Error.captureStackTrace(a(n),u),n.stack,n.name="AssertionError",i(n)}var n,u,l;return function(e,t){if("function"!==typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&s(e,t)}(t,e),n=t,u=[{key:"toString",value:function(){return"".concat(this.name," [").concat(this.code,"]: ").concat(this.message)}},{key:p.custom,value:function(e,t){return p(this,function(e){for(var t=1;t2?"one of ".concat(t," ").concat(e.slice(0,n-1).join(", "),", or ")+e[n-1]:2===n?"one of ".concat(t," ").concat(e[0]," or ").concat(e[1]):"of ".concat(t," ").concat(e[0])}return"of ".concat(t," ").concat(String(e))}c("ERR_AMBIGUOUS_ARGUMENT",'The "%s" argument is ambiguous. %s',TypeError),c("ERR_INVALID_ARG_TYPE",(function(e,t,o){var i,a,l,s;if(void 0===u&&(u=n(8093)),u("string"===typeof e,"'name' must be a string"),"string"===typeof t&&(a="not ",t.substr(!l||l<0?0:+l,a.length)===a)?(i="must not be",t=t.replace(/^not /,"")):i="must be",function(e,t,n){return(void 0===n||n>e.length)&&(n=e.length),e.substring(n-t.length,n)===t}(e," argument"))s="The ".concat(e," ").concat(i," ").concat(f(t,"type"));else{var c=function(e,t,n){return"number"!==typeof n&&(n=0),!(n+t.length>e.length)&&-1!==e.indexOf(t,n)}(e,".")?"property":"argument";s='The "'.concat(e,'" ').concat(c," ").concat(i," ").concat(f(t,"type"))}return s+=". Received type ".concat(r(o))}),TypeError),c("ERR_INVALID_ARG_VALUE",(function(e,t){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"is invalid";void 0===l&&(l=n(9639));var o=l.inspect(t);return o.length>128&&(o="".concat(o.slice(0,128),"...")),"The argument '".concat(e,"' ").concat(r,". Received ").concat(o)}),TypeError,RangeError),c("ERR_INVALID_RETURN_VALUE",(function(e,t,n){var o;return o=n&&n.constructor&&n.constructor.name?"instance of ".concat(n.constructor.name):"type ".concat(r(n)),"Expected ".concat(e,' to be returned from the "').concat(t,'"')+" function but got ".concat(o,".")}),TypeError),c("ERR_MISSING_ARGS",(function(){for(var e=arguments.length,t=new Array(e),r=0;r0,"At least one arg needs to be specified");var o="The ",i=t.length;switch(t=t.map((function(e){return'"'.concat(e,'"')})),i){case 1:o+="".concat(t[0]," argument");break;case 2:o+="".concat(t[0]," and ").concat(t[1]," arguments");break;default:o+=t.slice(0,i-1).join(", "),o+=", and ".concat(t[i-1]," arguments")}return"".concat(o," must be specified")}),TypeError),e.exports.codes=s},6912:function(e,t,n){"use strict";function r(e,t){return function(e){if(Array.isArray(e))return e}(e)||function(e,t){var n=[],r=!0,o=!1,i=void 0;try{for(var a,u=e[Symbol.iterator]();!(r=(a=u.next()).done)&&(n.push(a.value),!t||n.length!==t);r=!0);}catch(l){o=!0,i=l}finally{try{r||null==u.return||u.return()}finally{if(o)throw i}}return n}(e,t)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}()}function o(e){return o="function"===typeof Symbol&&"symbol"===typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"===typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},o(e)}var i=void 0!==/a/g.flags,a=function(e){var t=[];return e.forEach((function(e){return t.push(e)})),t},u=function(e){var t=[];return e.forEach((function(e,n){return t.push([n,e])})),t},l=Object.is?Object.is:n(3454),s=Object.getOwnPropertySymbols?Object.getOwnPropertySymbols:function(){return[]},c=Number.isNaN?Number.isNaN:n(6188);function f(e){return e.call.bind(e)}var p=f(Object.prototype.hasOwnProperty),d=f(Object.prototype.propertyIsEnumerable),h=f(Object.prototype.toString),y=n(9639).types,v=y.isAnyArrayBuffer,m=y.isArrayBufferView,g=y.isDate,b=y.isMap,w=y.isRegExp,x=y.isSet,_=y.isNativeError,S=y.isBoxedPrimitive,E=y.isNumberObject,k=y.isStringObject,T=y.isBooleanObject,j=y.isBigIntObject,O=y.isSymbolObject,P=y.isFloat32Array,C=y.isFloat64Array;function N(e){if(0===e.length||e.length>10)return!0;for(var t=0;t57)return!0}return 10===e.length&&e>=Math.pow(2,32)}function R(e){return Object.keys(e).filter(N).concat(s(e).filter(Object.prototype.propertyIsEnumerable.bind(e)))}function A(e,t){if(e===t)return 0;for(var n=e.length,r=t.length,o=0,i=Math.min(n,r);o-1?o(n):n}},9722:function(e,t,n){"use strict";var r=n(3350),o=n(2506),i=o("%Function.prototype.apply%"),a=o("%Function.prototype.call%"),u=o("%Reflect.apply%",!0)||r.call(a,i),l=o("%Object.getOwnPropertyDescriptor%",!0),s=o("%Object.defineProperty%",!0),c=o("%Math.max%");if(s)try{s({},"a",{value:1})}catch(p){s=null}e.exports=function(e){var t=u(r,a,arguments);l&&s&&(l(t,"length").configurable&&s(t,"length",{value:1+c(0,e.length-(arguments.length-1))}));return t};var f=function(){return u(r,i,arguments)};s?s(e.exports,"apply",{value:f}):e.exports.apply=f},9396:function(e,t,n){"use strict";var r=n(4892),o="function"===typeof Symbol&&"symbol"===typeof Symbol("foo"),i=Object.prototype.toString,a=Array.prototype.concat,u=Object.defineProperty,l=u&&function(){var e={};try{for(var t in u(e,"x",{enumerable:!1,value:e}),e)return!1;return e.x===e}catch(n){return!1}}(),s=function(e,t,n,r){var o;(!(t in e)||"function"===typeof(o=r)&&"[object Function]"===i.call(o)&&r())&&(l?u(e,t,{configurable:!0,enumerable:!1,value:n,writable:!0}):e[t]=n)},c=function(e,t){var n=arguments.length>2?arguments[2]:{},i=r(t);o&&(i=a.call(i,Object.getOwnPropertySymbols(t)));for(var u=0;u1&&"boolean"!==typeof t)throw new a('"allowMissing" argument must be a boolean');var n=function(e){var t=S(e,0,1),n=S(e,-1);if("%"===t&&"%"!==n)throw new o("invalid intrinsic syntax, expected closing `%`");if("%"===n&&"%"!==t)throw new o("invalid intrinsic syntax, expected opening `%`");var r=[];return _(e,E,(function(e,t,n,o){r[r.length]=n?_(o,k,"$1"):t||e})),r}(e),r=n.length>0?n[0]:"",i=T("%"+r+"%",t),u=i.name,s=i.value,c=!1,f=i.alias;f&&(r=f[0],x(n,w([0,1],f)));for(var p=1,d=!0;p=n.length){var g=l(s,h);s=(d=!!g)&&"get"in g&&!("originalValue"in g.get)?g.get:s[h]}else d=b(s,h),s=s[h];d&&!c&&(y[u]=s)}}return s}},697:function(e,t,n){"use strict";var r="undefined"!==typeof Symbol&&Symbol,o=n(3297);e.exports=function(){return"function"===typeof r&&("function"===typeof Symbol&&("symbol"===typeof r("foo")&&("symbol"===typeof Symbol("bar")&&o())))}},3297:function(e){"use strict";e.exports=function(){if("function"!==typeof Symbol||"function"!==typeof Object.getOwnPropertySymbols)return!1;if("symbol"===typeof Symbol.iterator)return!0;var e={},t=Symbol("test"),n=Object(t);if("string"===typeof t)return!1;if("[object Symbol]"!==Object.prototype.toString.call(t))return!1;if("[object Symbol]"!==Object.prototype.toString.call(n))return!1;for(t in e[t]=42,e)return!1;if("function"===typeof Object.keys&&0!==Object.keys(e).length)return!1;if("function"===typeof Object.getOwnPropertyNames&&0!==Object.getOwnPropertyNames(e).length)return!1;var r=Object.getOwnPropertySymbols(e);if(1!==r.length||r[0]!==t)return!1;if(!Object.prototype.propertyIsEnumerable.call(e,t))return!1;if("function"===typeof Object.getOwnPropertyDescriptor){var o=Object.getOwnPropertyDescriptor(e,t);if(42!==o.value||!0!==o.enumerable)return!1}return!0}},4707:function(e,t,n){"use strict";var r=n(3297);e.exports=function(){return r()&&!!Symbol.toStringTag}},8316:function(e,t,n){"use strict";var r=n(3350);e.exports=r.call(Function.call,Object.prototype.hasOwnProperty)},2110:function(e,t,n){"use strict";var r=n(8309),o={childContextTypes:!0,contextType:!0,contextTypes:!0,defaultProps:!0,displayName:!0,getDefaultProps:!0,getDerivedStateFromError:!0,getDerivedStateFromProps:!0,mixins:!0,propTypes:!0,type:!0},i={name:!0,length:!0,prototype:!0,caller:!0,callee:!0,arguments:!0,arity:!0},a={$$typeof:!0,compare:!0,defaultProps:!0,displayName:!0,propTypes:!0,type:!0},u={};function l(e){return r.isMemo(e)?a:u[e.$$typeof]||o}u[r.ForwardRef]={$$typeof:!0,render:!0,defaultProps:!0,displayName:!0,propTypes:!0},u[r.Memo]=a;var s=Object.defineProperty,c=Object.getOwnPropertyNames,f=Object.getOwnPropertySymbols,p=Object.getOwnPropertyDescriptor,d=Object.getPrototypeOf,h=Object.prototype;e.exports=function e(t,n,r){if("string"!==typeof n){if(h){var o=d(n);o&&o!==h&&e(t,o,r)}var a=c(n);f&&(a=a.concat(f(n)));for(var u=l(t),y=l(n),v=0;v=0&&"[object Array]"!==o(e)&&"[object Function]"===o(e.callee)},u=function(){return i(arguments)}();i.isLegacyArguments=a,e.exports=u?i:a},5718:function(e,t,n){"use strict";var r,o=Object.prototype.toString,i=Function.prototype.toString,a=/^\s*(?:function)?\*/,u=n(4707)(),l=Object.getPrototypeOf;e.exports=function(e){if("function"!==typeof e)return!1;if(a.test(i.call(e)))return!0;if(!u)return"[object GeneratorFunction]"===o.call(e);if(!l)return!1;if("undefined"===typeof r){var t=function(){if(!u)return!1;try{return Function("return function*() {}")()}catch(e){}}();r=!!t&&l(t)}return l(e)===r}},6510:function(e){"use strict";e.exports=function(e){return e!==e}},6188:function(e,t,n){"use strict";var r=n(9722),o=n(9396),i=n(6510),a=n(4951),u=n(6034),l=r(a(),Number);o(l,{getPolyfill:a,implementation:i,shim:u}),e.exports=l},4951:function(e,t,n){"use strict";var r=n(6510);e.exports=function(){return Number.isNaN&&Number.isNaN(NaN)&&!Number.isNaN("a")?Number.isNaN:r}},6034:function(e,t,n){"use strict";var r=n(9396),o=n(4951);e.exports=function(){var e=o();return r(Number,{isNaN:e},{isNaN:function(){return Number.isNaN!==e}}),e}},6218:function(e,t,n){"use strict";var r=n(7910),o=n(306),i=n(4037),a=i("Object.prototype.toString"),u=n(4707)(),l="undefined"===typeof globalThis?n.g:globalThis,s=o(),c=i("Array.prototype.indexOf",!0)||function(e,t){for(var n=0;n-1}return!!d&&function(e){var t=!1;return r(p,(function(n,r){if(!t)try{t=n.call(e)===r}catch(o){}})),t}(e)}},1571:function(e){e.exports=Array.isArray||function(e){return"[object Array]"==Object.prototype.toString.call(e)}},1725:function(e){"use strict";var t=Object.getOwnPropertySymbols,n=Object.prototype.hasOwnProperty,r=Object.prototype.propertyIsEnumerable;e.exports=function(){try{if(!Object.assign)return!1;var e=new String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var t={},n=0;n<10;n++)t["_"+String.fromCharCode(n)]=n;if("0123456789"!==Object.getOwnPropertyNames(t).map((function(e){return t[e]})).join(""))return!1;var r={};return"abcdefghijklmnopqrst".split("").forEach((function(e){r[e]=e})),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},r)).join("")}catch(o){return!1}}()?Object.assign:function(e,o){for(var i,a,u=function(e){if(null===e||void 0===e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}(e),l=1;l0&&!o.call(e,0))for(var y=0;y0)for(var v=0;v=0&&"[object Function]"===t.call(e.callee)),r}},6151:function(e,t,n){var r=n(1571);e.exports=d,e.exports.parse=i,e.exports.compile=function(e,t){return u(i(e,t),t)},e.exports.tokensToFunction=u,e.exports.tokensToRegExp=p;var o=new RegExp(["(\\\\.)","([\\/.])?(?:(?:\\:(\\w+)(?:\\(((?:\\\\.|[^\\\\()])+)\\))?|\\(((?:\\\\.|[^\\\\()])+)\\))([+*?])?|(\\*))"].join("|"),"g");function i(e,t){for(var n,r=[],i=0,a=0,u="",c=t&&t.delimiter||"/";null!=(n=o.exec(e));){var f=n[0],p=n[1],d=n.index;if(u+=e.slice(a,d),a=d+f.length,p)u+=p[1];else{var h=e[a],y=n[2],v=n[3],m=n[4],g=n[5],b=n[6],w=n[7];u&&(r.push(u),u="");var x=null!=y&&null!=h&&h!==y,_="+"===b||"*"===b,S="?"===b||"*"===b,E=n[2]||c,k=m||g;r.push({name:v||i++,prefix:y||"",delimiter:E,optional:S,repeat:_,partial:x,asterisk:!!w,pattern:k?s(k):w?".*":"[^"+l(E)+"]+?"})}}return a