string-match-left-right 8.2.3 → 8.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -39,7 +39,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
|
|
|
39
39
|
|
|
40
40
|
## 7.0.0 (2021-02-27)
|
|
41
41
|
|
|
42
|
-
###
|
|
42
|
+
### Fixed
|
|
43
43
|
|
|
44
44
|
- if the first char was matched, don't tolerate any mismatches leading up to it ([c482851](https://github.com/codsen/codsen/commit/c4828514dfcca6470d895f0b35801eac1faf2f7a))
|
|
45
45
|
|
|
@@ -55,7 +55,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
|
|
|
55
55
|
|
|
56
56
|
## 6.0.1 (2021-01-28)
|
|
57
57
|
|
|
58
|
-
###
|
|
58
|
+
### Fixed
|
|
59
59
|
|
|
60
60
|
- add testStats to npmignore ([f3c84e9](https://github.com/codsen/codsen/commit/f3c84e95afc5514214312f913692d85b2e12eb29))
|
|
61
61
|
|
|
@@ -75,13 +75,13 @@ Accidental version bump during migration to sourcehut. Sorry about that.
|
|
|
75
75
|
|
|
76
76
|
## 4.0.1 (2020-03-24)
|
|
77
77
|
|
|
78
|
-
###
|
|
78
|
+
### Fixed
|
|
79
79
|
|
|
80
80
|
- fix `opts.firstMustMatch` ([195350b](https://gitlab.com/codsen/codsen/commit/195350b56c26d3e856b5cd3d1a2abb947c9ada3d))
|
|
81
81
|
|
|
82
82
|
## 4.0.0 (2020-03-16)
|
|
83
83
|
|
|
84
|
-
###
|
|
84
|
+
### Fixed
|
|
85
85
|
|
|
86
86
|
- `opts.maxMismatches` higher than one ([c0a416a](https://gitlab.com/codsen/codsen/commit/c0a416afd32aa39698703437aed36b81cb04abd6))
|
|
87
87
|
- add insurance against the variable being not string ([e53f435](https://gitlab.com/codsen/codsen/commit/e53f435206b1b2daf1e7d9c45c8373933d09eca9))
|
|
@@ -180,7 +180,7 @@ GitHub sold us out. In the meantime, we:
|
|
|
180
180
|
|
|
181
181
|
## 2.0.0 (2017-12-21)
|
|
182
182
|
|
|
183
|
-
###
|
|
183
|
+
### Changes
|
|
184
184
|
|
|
185
185
|
- Let's say you want to check, does a string contain "something" to the right or to the left of somewhere in it (a given index). We allow "something" to be an **array** of strings. If those strings are of a varying length, how do you find out, what exactly did match from the "something" array and especially, how long it is? As a solution for that, I'm going to return a positive result not Boolean `true` which is meaningless, but actually the value of a matched string from "something". It is equally `truthy` but you can now query it further, like find its `length`.
|
|
186
186
|
|
|
@@ -192,7 +192,7 @@ If you relied on the result being explicitly Boolean, `true` or `false`, prepare
|
|
|
192
192
|
|
|
193
193
|
## 1.4.0 (2017-12-10)
|
|
194
194
|
|
|
195
|
-
###
|
|
195
|
+
### Features
|
|
196
196
|
|
|
197
197
|
- Stringifying of `opts.trimCharsBeforeMatching` now occurs only if element is not string.
|
|
198
198
|
- Callbacks, [opts.cbLeft and opts.cbRight](https://www.npmjs.com/package/string-match-left-right#optscbleft-and-optscbright), get second argument - whole substring of what's on that side. First argument it received is first character, second is whole substring (including first character).
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @name string-match-left-right
|
|
3
3
|
* @fileoverview Match substrings on the left or right of a given index, ignoring whitespace
|
|
4
|
-
* @version 8.2.
|
|
4
|
+
* @version 8.2.4
|
|
5
5
|
* @author Roy Revelt, Codsen Ltd
|
|
6
6
|
* @license MIT
|
|
7
7
|
* {@link https://codsen.com/os/string-match-left-right/}
|
|
8
8
|
*/
|
|
9
9
|
|
|
10
|
-
import{arrayiffy as N}from"arrayiffy-if-string";var O="8.2.
|
|
10
|
+
import{arrayiffy as N}from"arrayiffy-if-string";var O="8.2.4";var x=O;function w(t){return!!t&&typeof t=="object"&&!Array.isArray(t)}function p(t){return typeof t=="string"}var R={cb:void 0,i:!1,trimBeforeMatching:!1,trimCharsBeforeMatching:[],maxMismatches:0,firstMustMatch:!1,lastMustMatch:!1,hungry:!1},k=t=>t+1;function A(t,s,n,a,u=!1,o=k){let i=typeof n=="function"?n():n;if(+s<0&&u&&i==="EOL")return i;let r={...R,...a};if(s>=t.length&&!u)return!1;let c=u?1:n.length,E=0,h=!1,l=!1,m=!1,b=r.maxMismatches,e=s,g=!1,f=!1,$=!1;function d(){return E===1&&b<r.maxMismatches-1}for(;t[e];){let T=o(e);if(r.trimBeforeMatching&&t[e].trim()===""){if(!t[T]&&u&&n==="EOL")return!0;e=o(e);continue}if(r&&!r.i&&r.trimCharsBeforeMatching&&r.trimCharsBeforeMatching.includes(t[e])||r?.i&&r.trimCharsBeforeMatching&&r.trimCharsBeforeMatching.map(D=>D.toLowerCase()).includes(t[e].toLowerCase())){if(u&&n==="EOL"&&!t[T])return!0;e=o(e);continue}let M=T>e?n[n.length-c]:n[c-1];if(!r.i&&t[e]===M||r.i&&t[e].toLowerCase()===M.toLowerCase()){if(g||(g=!0),m||(m=!0),c===n.length){if(f=!0,b!==r.maxMismatches)return!1}else c===1&&($=!0);if(c-=1,E++,d())return!1;if(!c)return E!==n.length||b===r.maxMismatches||!h?e:!1}else if(!h&&!E&&(h=!0),r.maxMismatches&&b&&e){b-=1;for(let D=0;D<=b;D++){let C=T>e?n[n.length-c+1+D]:n[c-2-D],y=t[o(e)];if(C&&(!r.i&&t[e]===C||r.i&&t[e].toLowerCase()===C.toLowerCase())&&(!r.firstMustMatch||c!==n.length)){if(E++,d())return!1;c-=2,g=!0;break}else if(y&&C&&(!r.i&&y===C||r.i&&y.toLowerCase()===C.toLowerCase())&&(!r.firstMustMatch||c!==n.length)){if(!E&&!r.hungry)return!1;c-=1,g=!0;break}else if(C===void 0&&b>=0&&g&&(!r.firstMustMatch||f)&&(!r.lastMustMatch||$))return e}g||(l=e)}else return e===0&&c===1&&!r.lastMustMatch&&m?0:!1;if(l!==!1&&l!==e&&(l=!1),c<1)return e;e=o(e)}if(c>0)return u&&i==="EOL"?!0:r&&r.maxMismatches>=c&&m?l||0:!1}function V(t,s,n,a,u){if(w(u)&&Object.prototype.hasOwnProperty.call(u,"trimBeforeMatching")&&u&&typeof u.trimBeforeMatching!="boolean")throw new Error(`string-match-left-right/${t}(): [THROW_ID_09] opts.trimBeforeMatching should be boolean!${Array.isArray(u.trimBeforeMatching)?" Did you mean to use opts.trimCharsBeforeMatching?":""}`);let o={...R,...u};if(typeof o.trimCharsBeforeMatching=="string"&&(o.trimCharsBeforeMatching=N(o.trimCharsBeforeMatching)),o.trimCharsBeforeMatching=o.trimCharsBeforeMatching.map(h=>p(h)?h:String(h)),!p(s)||!s.length)return!1;if(!Number.isInteger(n)||n<0)throw new Error(`string-match-left-right/${t}(): [THROW_ID_03] the second argument should be a natural number. Currently it's of a type: ${typeof n}, equal to:
|
|
11
11
|
${JSON.stringify(n,null,4)}`);let i,r;if(p(a))i=[a];else if(Array.isArray(a))i=a;else if(!a)i=a;else if(typeof a=="function")i=[],i.push(a);else throw new Error(`string-match-left-right/${t}(): [THROW_ID_05] the third argument, whatToMatch, is neither string nor array of strings! It's ${typeof a}, equal to:
|
|
12
12
|
${JSON.stringify(a,null,4)}`);if(u&&!w(u))throw new Error(`string-match-left-right/${t}(): [THROW_ID_06] the fourth argument, options object, should be a plain object. Currently it's of a type "${typeof u}", and equal to:
|
|
13
13
|
${JSON.stringify(u,null,4)}`);let c=0,E="";if(o?.trimCharsBeforeMatching&&o.trimCharsBeforeMatching.some((h,l)=>h.length>1?(c=l,E=h,!0):!1))throw new Error(`string-match-left-right/${t}(): [THROW_ID_07] the fourth argument, options object contains trimCharsBeforeMatching. It was meant to list the single characters but one of the entries at index ${c} is longer than 1 character, ${E.length} (equals to ${E}). Please split it into separate characters and put into array as separate elements.`);if(!i||!Array.isArray(i)||Array.isArray(i)&&!i.length||Array.isArray(i)&&i.length===1&&p(i[0])&&!i[0].trim()){if(typeof o.cb=="function"){let l,m=n;if((t==="matchLeftIncl"||t==="matchRight")&&(m+=1),t[5]==="L")for(let f=m;f--;){let $=s[f];if((!o.trimBeforeMatching||o.trimBeforeMatching&&$!==void 0&&$.trim())&&(!o.trimCharsBeforeMatching?.length||$!==void 0&&!o.trimCharsBeforeMatching.includes($))){l=f;break}}else if(t.startsWith("matchRight"))for(let f=m;f<s.length;f++){let $=s[f];if((!o.trimBeforeMatching||o.trimBeforeMatching&&$.trim())&&(!o.trimCharsBeforeMatching?.length||!o.trimCharsBeforeMatching.includes($))){l=f;break}}if(l===void 0)return!1;let b=s[l],e=l+1,g="";return e&&e>0&&(g=s.slice(0,e)),t[5]==="L"||l&&l>0&&(g=s.slice(l)),o.cb(b,g,l)}let h="";throw u||(h=" More so, the whole options object, the fourth input argument, is missing!"),new Error(`string-match-left-right/${t}(): [THROW_ID_08] the third argument, "whatToMatch", was given as an empty string. This means, you intend to match purely by a callback. The callback was not set though, the opts key "cb" is not set!${h}`)}for(let h=0,l=i.length;h<l;h++){r=typeof i[h]=="function";let m=i[h],b,e,g="",f=n;t==="matchRight"?f+=1:t==="matchLeft"&&(f-=1);let $=A(s,f,m,o,r,d=>t[5]==="L"?d-1:d+1);if($&&r&&typeof m=="function"&&m()==="EOL")return m()&&(o.cb?o.cb(b,g,e):!0)?m():!1;if(Number.isInteger($)&&(e=t.startsWith("matchLeft")?$-1:$+1,t[5]==="L"?g=s.slice(0,$):g=s.slice(e)),e<0&&(e=void 0),s[e]&&(b=s[e]),Number.isInteger($)&&(o.cb?o.cb(b,g,e):!0))return m}return!1}function J(t,s,n,a){return V("matchLeftIncl",t,s,n,a)}function F(t,s,n,a){return V("matchLeft",t,s,n,a)}function H(t,s,n,a){return V("matchRightIncl",t,s,n,a)}function j(t,s,n,a){return V("matchRight",t,s,n,a)}export{k as defaultGetNextIdx,R as defaults,F as matchLeft,J as matchLeftIncl,j as matchRight,H as matchRightIncl,x as version};
|
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @name string-match-left-right
|
|
3
3
|
* @fileoverview Match substrings on the left or right of a given index, ignoring whitespace
|
|
4
|
-
* @version 8.2.
|
|
4
|
+
* @version 8.2.4
|
|
5
5
|
* @author Roy Revelt, Codsen Ltd
|
|
6
6
|
* @license MIT
|
|
7
7
|
* {@link https://codsen.com/os/string-match-left-right/}
|
|
8
8
|
*/
|
|
9
9
|
|
|
10
|
-
"use strict";var stringMatchLeftRight=(()=>{var y=Object.defineProperty;var J=Object.getOwnPropertyDescriptor;var F=Object.getOwnPropertyNames,N=Object.getOwnPropertySymbols;var A=Object.prototype.hasOwnProperty,H=Object.prototype.propertyIsEnumerable;var k=(t,n,e)=>n in t?y(t,n,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[n]=e,p=(t,n)=>{for(var e in n||(n={}))A.call(n,e)&&k(t,e,n[e]);if(N)for(var e of N(n))H.call(n,e)&&k(t,e,n[e]);return t};var j=(t,n)=>{for(var e in n)y(t,e,{get:n[e],enumerable:!0})},P=(t,n,e,i)=>{if(n&&typeof n=="object"||typeof n=="function")for(let a of F(n))!A.call(t,a)&&a!==e&&y(t,a,{get:()=>n[a],enumerable:!(i=J(n,a))||i.enumerable});return t};var U=t=>P(y({},"__esModule",{value:!0}),t);var X={};j(X,{defaultGetNextIdx:()=>x,defaults:()=>R,matchLeft:()=>Y,matchLeftIncl:()=>q,matchRight:()=>K,matchRightIncl:()=>G,version:()=>W});function L(t){return typeof t!="string"?t:t.length?[t]:[]}var B="8.2.
|
|
10
|
+
"use strict";var stringMatchLeftRight=(()=>{var y=Object.defineProperty;var J=Object.getOwnPropertyDescriptor;var F=Object.getOwnPropertyNames,N=Object.getOwnPropertySymbols;var A=Object.prototype.hasOwnProperty,H=Object.prototype.propertyIsEnumerable;var k=(t,n,e)=>n in t?y(t,n,{enumerable:!0,configurable:!0,writable:!0,value:e}):t[n]=e,p=(t,n)=>{for(var e in n||(n={}))A.call(n,e)&&k(t,e,n[e]);if(N)for(var e of N(n))H.call(n,e)&&k(t,e,n[e]);return t};var j=(t,n)=>{for(var e in n)y(t,e,{get:n[e],enumerable:!0})},P=(t,n,e,i)=>{if(n&&typeof n=="object"||typeof n=="function")for(let a of F(n))!A.call(t,a)&&a!==e&&y(t,a,{get:()=>n[a],enumerable:!(i=J(n,a))||i.enumerable});return t};var U=t=>P(y({},"__esModule",{value:!0}),t);var X={};j(X,{defaultGetNextIdx:()=>x,defaults:()=>R,matchLeft:()=>Y,matchLeftIncl:()=>q,matchRight:()=>K,matchRightIncl:()=>G,version:()=>W});function L(t){return typeof t!="string"?t:t.length?[t]:[]}var B="8.2.4";var W=B;function I(t){return!!t&&typeof t=="object"&&!Array.isArray(t)}function M(t){return typeof t=="string"}var R={cb:void 0,i:!1,trimBeforeMatching:!1,trimCharsBeforeMatching:[],maxMismatches:0,firstMustMatch:!1,lastMustMatch:!1,hungry:!1},x=t=>t+1;function _(t,n,e,i,a=!1,s=x){let c=typeof e=="function"?e():e;if(+n<0&&a&&c==="EOL")return c;let o=p(p({},R),i);if(n>=t.length&&!a)return!1;let u=a?1:e.length,E=0,T=!1,C=!1,h=!1,l=o.maxMismatches,r=n,f=!1,$=!1,b=!1;function g(){return E===1&&l<o.maxMismatches-1}for(;t[r];){let D=s(r);if(o.trimBeforeMatching&&t[r].trim()===""){if(!t[D]&&a&&e==="EOL")return!0;r=s(r);continue}if(o&&!o.i&&o.trimCharsBeforeMatching&&o.trimCharsBeforeMatching.includes(t[r])||(o==null?void 0:o.i)&&o.trimCharsBeforeMatching&&o.trimCharsBeforeMatching.map(V=>V.toLowerCase()).includes(t[r].toLowerCase())){if(a&&e==="EOL"&&!t[D])return!0;r=s(r);continue}let S=D>r?e[e.length-u]:e[u-1];if(!o.i&&t[r]===S||o.i&&t[r].toLowerCase()===S.toLowerCase()){if(f||(f=!0),h||(h=!0),u===e.length){if($=!0,l!==o.maxMismatches)return!1}else u===1&&(b=!0);if(u-=1,E++,g())return!1;if(!u)return E!==e.length||l===o.maxMismatches||!T?r:!1}else if(!T&&!E&&(T=!0),o.maxMismatches&&l&&r){l-=1;for(let V=0;V<=l;V++){let d=D>r?e[e.length-u+1+V]:e[u-2-V],w=t[s(r)];if(d&&(!o.i&&t[r]===d||o.i&&t[r].toLowerCase()===d.toLowerCase())&&(!o.firstMustMatch||u!==e.length)){if(E++,g())return!1;u-=2,f=!0;break}else if(w&&d&&(!o.i&&w===d||o.i&&w.toLowerCase()===d.toLowerCase())&&(!o.firstMustMatch||u!==e.length)){if(!E&&!o.hungry)return!1;u-=1,f=!0;break}else if(d===void 0&&l>=0&&f&&(!o.firstMustMatch||$)&&(!o.lastMustMatch||b))return r}f||(C=r)}else return r===0&&u===1&&!o.lastMustMatch&&h?0:!1;if(C!==!1&&C!==r&&(C=!1),u<1)return r;r=s(r)}if(u>0)return a&&c==="EOL"?!0:o&&o.maxMismatches>=u&&h?C||0:!1}function O(t,n,e,i,a){var T,C;if(I(a)&&Object.prototype.hasOwnProperty.call(a,"trimBeforeMatching")&&a&&typeof a.trimBeforeMatching!="boolean")throw new Error(`string-match-left-right/${t}(): [THROW_ID_09] opts.trimBeforeMatching should be boolean!${Array.isArray(a.trimBeforeMatching)?" Did you mean to use opts.trimCharsBeforeMatching?":""}`);let s=p(p({},R),a);if(typeof s.trimCharsBeforeMatching=="string"&&(s.trimCharsBeforeMatching=L(s.trimCharsBeforeMatching)),s.trimCharsBeforeMatching=s.trimCharsBeforeMatching.map(h=>M(h)?h:String(h)),!M(n)||!n.length)return!1;if(!Number.isInteger(e)||e<0)throw new Error(`string-match-left-right/${t}(): [THROW_ID_03] the second argument should be a natural number. Currently it's of a type: ${typeof e}, equal to:
|
|
11
11
|
${JSON.stringify(e,null,4)}`);let c,o;if(M(i))c=[i];else if(Array.isArray(i))c=i;else if(!i)c=i;else if(typeof i=="function")c=[],c.push(i);else throw new Error(`string-match-left-right/${t}(): [THROW_ID_05] the third argument, whatToMatch, is neither string nor array of strings! It's ${typeof i}, equal to:
|
|
12
12
|
${JSON.stringify(i,null,4)}`);if(a&&!I(a))throw new Error(`string-match-left-right/${t}(): [THROW_ID_06] the fourth argument, options object, should be a plain object. Currently it's of a type "${typeof a}", and equal to:
|
|
13
13
|
${JSON.stringify(a,null,4)}`);let u=0,E="";if((s==null?void 0:s.trimCharsBeforeMatching)&&s.trimCharsBeforeMatching.some((h,l)=>h.length>1?(u=l,E=h,!0):!1))throw new Error(`string-match-left-right/${t}(): [THROW_ID_07] the fourth argument, options object contains trimCharsBeforeMatching. It was meant to list the single characters but one of the entries at index ${u} is longer than 1 character, ${E.length} (equals to ${E}). Please split it into separate characters and put into array as separate elements.`);if(!c||!Array.isArray(c)||Array.isArray(c)&&!c.length||Array.isArray(c)&&c.length===1&&M(c[0])&&!c[0].trim()){if(typeof s.cb=="function"){let l,r=e;if((t==="matchLeftIncl"||t==="matchRight")&&(r+=1),t[5]==="L")for(let g=r;g--;){let m=n[g];if((!s.trimBeforeMatching||s.trimBeforeMatching&&m!==void 0&&m.trim())&&(!((T=s.trimCharsBeforeMatching)!=null&&T.length)||m!==void 0&&!s.trimCharsBeforeMatching.includes(m))){l=g;break}}else if(t.startsWith("matchRight"))for(let g=r;g<n.length;g++){let m=n[g];if((!s.trimBeforeMatching||s.trimBeforeMatching&&m.trim())&&(!((C=s.trimCharsBeforeMatching)!=null&&C.length)||!s.trimCharsBeforeMatching.includes(m))){l=g;break}}if(l===void 0)return!1;let f=n[l],$=l+1,b="";return $&&$>0&&(b=n.slice(0,$)),t[5]==="L"||l&&l>0&&(b=n.slice(l)),s.cb(f,b,l)}let h="";throw a||(h=" More so, the whole options object, the fourth input argument, is missing!"),new Error(`string-match-left-right/${t}(): [THROW_ID_08] the third argument, "whatToMatch", was given as an empty string. This means, you intend to match purely by a callback. The callback was not set though, the opts key "cb" is not set!${h}`)}for(let h=0,l=c.length;h<l;h++){o=typeof c[h]=="function";let r=c[h],f,$,b="",g=e;t==="matchRight"?g+=1:t==="matchLeft"&&(g-=1);let m=_(n,g,r,s,o,D=>t[5]==="L"?D-1:D+1);if(m&&o&&typeof r=="function"&&r()==="EOL")return r()&&(s.cb?s.cb(f,b,$):!0)?r():!1;if(Number.isInteger(m)&&($=t.startsWith("matchLeft")?m-1:m+1,t[5]==="L"?b=n.slice(0,m):b=n.slice($)),$<0&&($=void 0),n[$]&&(f=n[$]),Number.isInteger(m)&&(s.cb?s.cb(f,b,$):!0))return r}return!1}function q(t,n,e,i){return O("matchLeftIncl",t,n,e,i)}function Y(t,n,e,i){return O("matchLeft",t,n,e,i)}function G(t,n,e,i){return O("matchRightIncl",t,n,e,i)}function K(t,n,e,i){return O("matchRight",t,n,e,i)}return U(X);})();
|
|
14
14
|
/**
|
|
15
15
|
* @name arrayiffy-if-string
|
|
16
16
|
* @fileoverview Put non-empty strings into arrays, turn empty-ones into empty arrays. Bypass everything else.
|
|
17
|
-
* @version 4.1.
|
|
17
|
+
* @version 4.1.3
|
|
18
18
|
* @author Roy Revelt, Codsen Ltd
|
|
19
19
|
* @license MIT
|
|
20
20
|
* {@link https://codsen.com/os/arrayiffy-if-string/}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "string-match-left-right",
|
|
3
|
-
"version": "8.2.
|
|
3
|
+
"version": "8.2.4",
|
|
4
4
|
"description": "Match substrings on the left or right of a given index, ignoring whitespace",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"left",
|
|
@@ -66,9 +66,9 @@
|
|
|
66
66
|
}
|
|
67
67
|
},
|
|
68
68
|
"dependencies": {
|
|
69
|
-
"arrayiffy-if-string": "^4.1.
|
|
69
|
+
"arrayiffy-if-string": "^4.1.3",
|
|
70
70
|
"lodash.isplainobject": "^4.0.6",
|
|
71
|
-
"string-character-is-astral-surrogate": "^2.1.
|
|
71
|
+
"string-character-is-astral-surrogate": "^2.1.3"
|
|
72
72
|
},
|
|
73
73
|
"devDependencies": {
|
|
74
74
|
"@types/lodash.isplainobject": "^4.0.7"
|