@mikezimm/fps-library-v2 1.0.149 → 1.0.150
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 +46 -34
- package/lib/components/atoms/PersonaCard/Interfaces/IPersonaCardProps.d.ts +1 -0
- package/lib/components/atoms/PersonaCard/Interfaces/IPersonaCardProps.d.ts.map +1 -1
- package/lib/components/atoms/PersonaCard/PersonaCard.js +2 -2
- package/lib/components/atoms/PersonaCard/PersonaCard.js.map +1 -1
- package/lib/components/atoms/Suggestions/getSuggestionsByKeys.d.ts.map +1 -1
- package/lib/components/atoms/Suggestions/getSuggestionsByKeys.js +20 -3
- package/lib/components/atoms/Suggestions/getSuggestionsByKeys.js.map +1 -1
- package/lib/components/molecules/SearchPage/component/SearchBoxRow.js +1 -1
- package/lib/components/molecules/SearchPage/component/SearchBoxRow.js.map +1 -1
- package/lib/logic/Regex/constants.d.ts +12 -0
- package/lib/logic/Regex/constants.d.ts.map +1 -1
- package/lib/logic/Regex/constants.js +13 -0
- package/lib/logic/Regex/constants.js.map +1 -1
- package/lib/logic/Strings/getStringArrayBasic.d.ts +26 -0
- package/lib/logic/Strings/getStringArrayBasic.d.ts.map +1 -0
- package/lib/logic/Strings/getStringArrayBasic.js +42 -0
- package/lib/logic/Strings/getStringArrayBasic.js.map +1 -0
- package/lib/logic/Strings/getWordsFromString.d.ts +14 -0
- package/lib/logic/Strings/getWordsFromString.d.ts.map +1 -1
- package/lib/logic/Strings/getWordsFromString.js +25 -10
- package/lib/logic/Strings/getWordsFromString.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -11,42 +11,54 @@ npm install @mikezimm/fps-library-v2@1.0.149
|
|
|
11
11
|
|
|
12
12
|
NOTE: TURN BACK ON STRICT NULL CHECKS - turned off for PropPaneCols
|
|
13
13
|
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
## 1.0.150 - 2023-Mar-30: Suggestions and Words
|
|
17
|
+
- create getStringArrayBasic in src/logic/Strings/getStringArrayBasic - similar logic was used both in Words and Suggestions
|
|
18
|
+
- modify getArrayOfWordsFromString to use getStringArrayBasic since that logic was in multiple places
|
|
19
|
+
- update getSuggestionsFromStrings to use common function to get words from strings ( getStringArrayBasic ) - src/components/atoms/Suggestions/getSuggestionsByKeys.ts
|
|
20
|
+
- added some common regex constants for easier reference which were used in getStringArrayBasic
|
|
21
|
+
|
|
22
|
+
## 1.0.150 - 2023-Mar-28: PersonaCard and SearchBoxRow css fixes
|
|
23
|
+
- fix docCardClass in PersonaCard.tsx to properly show theme color if provided
|
|
24
|
+
- fix css require in src/components/molecules/SearchPage/component/SearchBoxRow.tsx
|
|
25
|
+
|
|
14
26
|
## 1.0.149 - 2023-Mar-28: PersonaCard, PersonaRow, Suggestions, WordSummary, SourceSearchHook etc from Compliance and ALVFM
|
|
15
|
-
- add PersonaCard and PersonaRow from Compliance to src
|
|
16
|
-
- add Suggestions logic, interface and samples from Compliance to src
|
|
17
|
-
- add WordSummary from Compliance to src
|
|
18
|
-
- add getWordsFromString and related functions from Compliance to src
|
|
19
|
-
- add SourceSearchHook from Complaince to src
|
|
20
|
-
- add ISourceInfo from Compliance to src
|
|
21
|
-
- add getFiltered from Compliance to src
|
|
22
|
-
- add SourceList ItemPane from ALVFinMan to src
|
|
27
|
+
- add PersonaCard and PersonaRow from Compliance to src/components/atoms/PersonaCard <<< NEED TO VERIFY >>>
|
|
28
|
+
- add Suggestions logic, interface and samples from Compliance to src/components/atoms/Suggestions <<< NEED TO VERIFY >>>
|
|
29
|
+
- add WordSummary from Compliance to src/components/atoms/WordSummary/ <<< NEED TO VERIFY >>>
|
|
30
|
+
- add getWordsFromString and related functions from Compliance to src/logic/Strings/getWordsFromString
|
|
31
|
+
- add SourceSearchHook from Complaince to src/components/molecules/SearchPage/component/SearchBoxRow
|
|
32
|
+
- add ISourceInfo from Compliance to src/pnpjs/SourceItems/Interface
|
|
33
|
+
- add getFiltered from Compliance to src/components/molecules/SearchPage/functions/getFilteredV1
|
|
34
|
+
- add SourceList ItemPane from ALVFinMan to src/components/molecules/SourceList/ItemPane/component
|
|
23
35
|
|
|
24
36
|
## 1.0.149 - 2023-Mar-26: month date labels and pref language
|
|
25
37
|
- fix casing of return in getFPSPrefNavLang since all are supposed to be LC.
|
|
26
38
|
|
|
27
39
|
## 1.0.148 - 2023-Mar-26: month date labels and pref language
|
|
28
|
-
- add getMonthStr3Array, getMMMDDFromDate and getMMMDDFromStr to src
|
|
29
|
-
- add getMonthStrArray, getFullMonthStrFromDate and getFullMonthStrFromDate to src
|
|
40
|
+
- add getMonthStr3Array, getMMMDDFromDate and getMMMDDFromStr to src/logic/Time/monthLabels.ts
|
|
41
|
+
- add getMonthStrArray, getFullMonthStrFromDate and getFullMonthStrFromDate to src/logic/Time/monthStrings.ts
|
|
30
42
|
|
|
31
43
|
## 1.0.147 - 2023-Mar-26: month and day labels
|
|
32
44
|
- add IFPSDateLanguageObject as object interface for monthStr3 and weekday3
|
|
33
|
-
- moved monthStr to src
|
|
34
|
-
- created monthStr with original keys also in src
|
|
45
|
+
- moved monthStr to src/logic/Time/monthStrings (from monthLabels)
|
|
46
|
+
- created monthStr with original keys also in src/logic/Time/monthStrOldKeys
|
|
35
47
|
|
|
36
48
|
## 1.0.146 - 2023-Mar-20: Various
|
|
37
|
-
- add fileSizeNumber to IFPSFileObject in src
|
|
49
|
+
- add fileSizeNumber to IFPSFileObject in src/pnpjs/SourceItems/FileInterface and addSearchMeta1
|
|
38
50
|
- update getHighlightedText for error when text === undefined
|
|
39
51
|
|
|
40
52
|
## 1.0.145 - 2023-Mar-20: Various
|
|
41
53
|
- update getSizeLabel to account for 1024 bits per byte
|
|
42
54
|
- update IContentGroup options: ContentGroupFolder: IContentGroup = 'Folder'; ContentGroupOther: IContentGroup = 'Other';
|
|
43
|
-
- change itemIsFolder to itemIsFolderContent in src
|
|
44
|
-
- add docm to StdFileSearchTypes in src
|
|
55
|
+
- change itemIsFolder to itemIsFolderContent in src/components/molecules/SourceList/IAnyContent.ts
|
|
56
|
+
- add docm to StdFileSearchTypes in src/components/molecules/SearchPage/Interfaces/StandardTypes.ts
|
|
45
57
|
|
|
46
58
|
## 1.0.144 - 2023-Mar-20: SearchTypes
|
|
47
59
|
- refactor addItemIsA to simplify code ( put updates in if item.meta .... )
|
|
48
60
|
- update addSearchMeta2 - map item.allIsAKeys into meta in case it was not already added
|
|
49
|
-
- change ItemIsDataContent from xml file to json in components
|
|
61
|
+
- change ItemIsDataContent from xml file to json in components/molecules/SearchPage/Interfaces/ProgrammingFileKeys.ts
|
|
50
62
|
- refactor mergeWordArrays to use spread to avoid using direct reference to array.
|
|
51
63
|
|
|
52
64
|
## 1.0.143 - 2023-Mar-20: SearchTypes
|
|
@@ -65,13 +77,13 @@ NOTE: TURN BACK ON STRICT NULL CHECKS - turned off for PropPaneCols
|
|
|
65
77
|
- create ALLProgrammingFileKeys for normal plus XKeys... add to addItemIsA function for ItemIsCodeContent
|
|
66
78
|
|
|
67
79
|
## 1.0.140 - 2023-Mar-19: SearchTypes
|
|
68
|
-
- add forgotten values to ItemIsAKeys in src
|
|
80
|
+
- add forgotten values to ItemIsAKeys in src/components/molecules/SourceList/IAnyContent.ts
|
|
69
81
|
- update addSearchMeta2 to properly use ItemIsAKeys
|
|
70
82
|
- add contentGroup to OneNote search type
|
|
71
83
|
|
|
72
84
|
## 1.0.139 - 2023-Mar-19: SearchTypes
|
|
73
85
|
- move 'folder' into "StdFileKeys"
|
|
74
|
-
- add additional ItemIs${contentGroup}Content via src
|
|
86
|
+
- add additional ItemIs${contentGroup}Content via src/components/molecules/SearchPage/functions/addItemIsA.ts
|
|
75
87
|
- change ProgrammingSharePoint to ProgrammingFile in addItemIsA and related places
|
|
76
88
|
|
|
77
89
|
## 1.0.138 - 2023-Mar-19: SearchTypes
|
|
@@ -81,7 +93,7 @@ NOTE: TURN BACK ON STRICT NULL CHECKS - turned off for PropPaneCols
|
|
|
81
93
|
## 1.0.137 - 2023-Mar-19: SearchTypes
|
|
82
94
|
- add ProgrammingSharePointKeys and ProgrammingSharePointSearchTypes: "js", "html", "css", "json", "xml", "exe", "ps1"
|
|
83
95
|
- add XProgrammingSharePointKeys and XProgrammingSharePointSearchTypes: "ts", "md", "py", "vba"
|
|
84
|
-
- create ProgrammingSharePointKeys, ProgrammingSharePointSearchTypes, MAXSearchTypes to src
|
|
96
|
+
- create ProgrammingSharePointKeys, ProgrammingSharePointSearchTypes, MAXSearchTypes to src/components/molecules/SearchPage/Interfaces/ProgrammingFileKeys.ts
|
|
85
97
|
- change order of keys/obj in SearchTypes - moved MediaFileKeys and MediaFileSearchTypes to end
|
|
86
98
|
- add ItemIsCode and itemIsCode IAnySourceItem and also addOtherIsAMeta
|
|
87
99
|
|
|
@@ -90,7 +102,7 @@ NOTE: TURN BACK ON STRICT NULL CHECKS - turned off for PropPaneCols
|
|
|
90
102
|
|
|
91
103
|
|
|
92
104
|
## 1.0.136 - 2023-Mar-19: SearchTypes
|
|
93
|
-
- add color, similarKey and warning to ISearchType in src
|
|
105
|
+
- add color, similarKey and warning to ISearchType in src/components/molecules/SearchPage/Interfaces/StandardTypes.ts
|
|
94
106
|
- added eXTreme Storage file types/icons to StandardTypes
|
|
95
107
|
- reorganized StdFileSearchTypes into StdFileSearchTypes and MediaFileSearchTypes
|
|
96
108
|
- update IAnySourceItem to have both typeIdx (original === adjusted) AND searchTypeIdx which is the actual index
|
|
@@ -101,33 +113,33 @@ NOTE: TURN BACK ON STRICT NULL CHECKS - turned off for PropPaneCols
|
|
|
101
113
|
- remove BaseType because it does not exist on items.
|
|
102
114
|
|
|
103
115
|
## 1.0.134 - 2023-Mar-19: IDefaultUser, Sources, addSearchMeta1, IAnyContent, searchTextLC
|
|
104
|
-
- add folderString and folderTree to src
|
|
105
|
-
- add automatically BaseType FileInterface, ModernSitePagesColumns and to all sourceProps in src
|
|
106
|
-
- add 10 itemIsA... props to IAnyContent src
|
|
116
|
+
- add folderString and folderTree to src/components/molecules/SearchPage/functions/addSearchMeta1.ts
|
|
117
|
+
- add automatically BaseType FileInterface, ModernSitePagesColumns and to all sourceProps in src/pnpjs/SourceItems/createMinFetchProps.ts
|
|
118
|
+
- add 10 itemIsA... props to IAnyContent src/components/molecules/SourceList/IAnyContent.ts
|
|
107
119
|
- add 10 itemIsA... props item.searchTextLC
|
|
108
120
|
|
|
109
121
|
- add performanceSettings to all generic Sources - Files, News, SitePages, NewsLinks
|
|
110
|
-
- add 'ContentType/Name' to libraryColumns in src
|
|
111
|
-
- add docset and folder to StdFileSearchTypes in src
|
|
122
|
+
- add 'ContentType/Name' to libraryColumns in src/pnpjs/SourceItems/FileInterface.ts
|
|
123
|
+
- add docset and folder to StdFileSearchTypes in src/components/molecules/SearchPage/Interfaces/StandardTypes.ts
|
|
112
124
|
- update addSearchMeta1 to include folder and docSet icons, also add folder parent url to searchDesc
|
|
113
125
|
- update IFPSFileObject with user interface
|
|
114
126
|
|
|
115
127
|
|
|
116
128
|
## 1.0.133 - 2023-Mar-17: IPagesContent, IFPSFileObject, IStateSource, etc
|
|
117
|
-
- migrate IPagesContent and IPagesContentFull from ALVFM to src
|
|
118
|
-
- migrate IStateSource from Compliance to src
|
|
129
|
+
- migrate IPagesContent and IPagesContentFull from ALVFM to src/pnpjs/SourceItems/SitePages/IPagesContent.ts
|
|
130
|
+
- migrate IStateSource from Compliance to src/pnpjs/Common/IStateSource.ts
|
|
119
131
|
- update IAnySourceItem - add HasUniqueRoleAssignments? boolean;
|
|
120
132
|
- update libraryColumns - remove duplicate strings
|
|
121
|
-
- create IFPSFileObject in src
|
|
133
|
+
- create IFPSFileObject in src/pnpjs/SourceItems/FileInterface.ts
|
|
122
134
|
|
|
123
135
|
## 1.0.132 - 2023-Mar-16: ComplianceOps updates
|
|
124
|
-
- create getArrayOfWordsFromString, mergeArrayOfWordsFromString in src
|
|
136
|
+
- create getArrayOfWordsFromString, mergeArrayOfWordsFromString in src/logic/Strings/getWordsFromString.ts
|
|
125
137
|
|
|
126
|
-
- create WebUrlHook in src
|
|
127
|
-
- create HTTPApiHook in src
|
|
128
|
-
- create fetchAPI in src
|
|
129
|
-
- create createLibrarySource in src
|
|
130
|
-
- create createSeriesSort in src
|
|
138
|
+
- create WebUrlHook in src/components/molecules/WebUrlBox
|
|
139
|
+
- create HTTPApiHook in src/components/molecules/HTTP/HttpApiBox/component.tsx
|
|
140
|
+
- create fetchAPI in src/components/molecules/HTTP/HttpFetch/functions.ts
|
|
141
|
+
- create createLibrarySource in src/pnpjs/SourceItems/createLibrarySource.ts
|
|
142
|
+
- create createSeriesSort in src/pnpjs/SourceItems/createOrderBy.ts
|
|
131
143
|
|
|
132
144
|
## 1.0.131 - 2023-Feb-25: checkAnyResults AccessDenied
|
|
133
145
|
- update checkAnyResults to set status to 'AccessDenied' instead of just 'Error'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IPersonaCardProps.d.ts","sourceRoot":"","sources":["../../../../../src/components/atoms/PersonaCard/Interfaces/IPersonaCardProps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,WAAW,EACZ,MAAM,oCAAoC,CAAC;AAC5C,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,cAAc,CAAC;IACxB,iBAAiB,EAAE,eAAe,CAAC;IAEnC,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"IPersonaCardProps.d.ts","sourceRoot":"","sources":["../../../../../src/components/atoms/PersonaCard/Interfaces/IPersonaCardProps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,WAAW,EACZ,MAAM,oCAAoC,CAAC;AAC5C,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,cAAc,CAAC;IACxB,iBAAiB,EAAE,eAAe,CAAC;IAEnC,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IAUrB,gCAAgC,CAAC,EAAE,MAAM,CAAC;CAC3C"}
|
|
@@ -136,14 +136,14 @@ export class PersonaCard extends React.Component {
|
|
|
136
136
|
*/
|
|
137
137
|
_PersonaCard() {
|
|
138
138
|
const sizeBracket = this.props.size === PersonaSize.size16 || this.props.size === PersonaSize.size10 ? 'small' : 'large';
|
|
139
|
-
let docCardClass =
|
|
139
|
+
let docCardClass = `documentCardDefault${this.props.borderColorMsColorThemeDarkClass ? ` ${this.props.borderColorMsColorThemeDarkClass}` : ''}`;
|
|
140
140
|
if (this.props.profileProperties.isSiteAdmin === true) {
|
|
141
141
|
docCardClass = 'documentCardAdmin';
|
|
142
142
|
}
|
|
143
143
|
else if (this.props.profileProperties.isGuest === true) {
|
|
144
144
|
docCardClass = 'documentCardGuest';
|
|
145
145
|
}
|
|
146
|
-
const docCardClassFinal = [docCardClass, sizeBracket === 'large' ? 'documentCardBorder' : 'documentCardNoBorder'].join(' ');
|
|
146
|
+
const docCardClassFinal = [docCardClass, sizeBracket === 'large' ? 'documentCardBorder' : 'documentCardNoBorder',].join(' ');
|
|
147
147
|
const iconSize = this.props.iconSize;
|
|
148
148
|
const iconTextSize = this.props.iconTextSize;
|
|
149
149
|
const iconLeftPad = sizeBracket === 'large' ? '0px' : '20px';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PersonaCard.js","sourceRoot":"","sources":["../../../../src/components/atoms/PersonaCard/PersonaCard.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"PersonaCard.js","sourceRoot":"","sources":["../../../../src/components/atoms/PersonaCard/PersonaCard.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSuggestionsByKeys.d.ts","sourceRoot":"","sources":["../../../../src/components/atoms/Suggestions/getSuggestionsByKeys.ts"],"names":[],"mappings":"AACA;;GAEG;
|
|
1
|
+
{"version":3,"file":"getSuggestionsByKeys.d.ts","sourceRoot":"","sources":["../../../../src/components/atoms/Suggestions/getSuggestionsByKeys.ts"],"names":[],"mappings":"AACA;;GAEG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,wBAAgB,yBAAyB,CAAE,OAAO,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,GAAG,GAAE,MAAa,GAAI,WAAW,EAAE,CAG5H;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,GAAG,GAAE,MAAa,GAAI,WAAW,EAAE,CAqD9H"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Originally copied from Compliance web part 2023-03-28
|
|
3
3
|
*/
|
|
4
|
+
import { getStringArrayBasic } from "../../../logic/Strings/getStringArrayBasic";
|
|
4
5
|
export function getSuggestionsFromStrings(strings, suggestions, max = 1000) {
|
|
5
6
|
const results = getSuggestionsByKeys({ key: strings.join(';') }, ['key'], suggestions);
|
|
6
7
|
return results;
|
|
@@ -16,9 +17,25 @@ export function getSuggestionsByKeys(item, keys, suggestions, max = 1000) {
|
|
|
16
17
|
keys.map(key => {
|
|
17
18
|
//Exclude empty keys, if results is more than max, if the item[key] is not a string or is empty
|
|
18
19
|
if (key && results.length < max && item[key] && typeof item[key] === 'string') {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
/**
|
|
21
|
+
* get array of strings only (aka words) from the item proprty
|
|
22
|
+
* Original code:
|
|
23
|
+
* const keyVals: string[] = item[key].replace(/[0-9]/g, " ").split(/\b([a-z]+)\b/gi);
|
|
24
|
+
*
|
|
25
|
+
* https://github.com/mikezimm/Compliance/issues/138
|
|
26
|
+
*
|
|
27
|
+
* Test code: resulting in ["test","i","ng","as","dfasd","asdf"]
|
|
28
|
+
const item = 'test1234~321i~ng as?!_$dfasd. -++[asdf];?~!&^$%...,;'
|
|
29
|
+
const keyVals = item.replace(/[0-9.,;:?~!&^$%+_[\]-]/g, " ").replace(/\s\s+/g, ' ').split(/\b([a-z]+)\b/gi).filter( v => v.trim() !== '' );
|
|
30
|
+
console.log( keyVals )
|
|
31
|
+
*/
|
|
32
|
+
// const keyVals: string[] = item[key].replace(/[0-9.,;:?~!&^$%+_[\]-]/g, " ") // Should now remove any of these characters 0-9.,;?~!&^$%+_-
|
|
33
|
+
// .replace(/\s\s+/g, ' ') // then replace multiple spaces with single space.
|
|
34
|
+
// .split(/\b([a-z]+)\b/gi) // Then split into words,
|
|
35
|
+
// .filter( ( v: string ) => v.trim() !== '' ); // then remove spaces and empties
|
|
36
|
+
// Opted to use getStringArrayBasic instead of getArrayOfWordsFromString since it only needs to compare to suggestions.
|
|
37
|
+
const originalWords = getStringArrayBasic(item[key], true);
|
|
38
|
+
originalWords.map(keyval => {
|
|
22
39
|
let found = false;
|
|
23
40
|
suggestions.map((suggestion) => {
|
|
24
41
|
if (results.length < max && found === false)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSuggestionsByKeys.js","sourceRoot":"","sources":["../../../../src/components/atoms/Suggestions/getSuggestionsByKeys.ts"],"names":[],"mappings":"AACA;;GAEG;
|
|
1
|
+
{"version":3,"file":"getSuggestionsByKeys.js","sourceRoot":"","sources":["../../../../src/components/atoms/Suggestions/getSuggestionsByKeys.ts"],"names":[],"mappings":"AACA;;GAEG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AAGjF,MAAM,UAAU,yBAAyB,CAAE,OAAiB,EAAE,WAA0B,EAAE,MAAc,IAAI;IAC1G,MAAM,OAAO,GAAkB,oBAAoB,CAAE,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,WAAW,CAAE,CAAC;IACxG,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAS,EAAE,IAAc,EAAE,WAA0B,EAAE,MAAc,IAAI;IAE5G,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAC5B,OAAO,EAAE,CAAC;SACP,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAC/C,OAAO,EAAE,CAAC;SACP,IAAI,GAAG,KAAK,CAAC;QAChB,OAAO,EAAE,CAAC;IAEZ,MAAM,OAAO,GAAkB,EAAE,CAAC;IAElC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACb,+FAA+F;QAC/F,IAAK,GAAG,IAAI,OAAO,CAAC,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE;YAEhF;;;;;;;;;;;gBAWI;YAEF,6IAA6I;YAC7I,+GAA+G;YAC/G,sFAAsF;YACtF,+GAA+G;YAE/G,uHAAuH;YACvH,MAAM,aAAa,GAAa,mBAAmB,CAAE,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAE,CAAC;YAEvE,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBACzB,IAAI,KAAK,GAAY,KAAK,CAAC;gBAC3B,WAAW,CAAC,GAAG,CAAC,CAAC,UAAuB,EAAE,EAAE;oBAC1C,IAAI,OAAO,CAAC,MAAM,GAAG,GAAG,IAAI,KAAK,KAAK,KAAK;wBACzC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE;4BACtC,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE;gCACjC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gCACzB,KAAK,GAAG,IAAI,CAAC;6BACd;wBACH,CAAC,CAAC,CAAC;gBACP,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AAEjB,CAAC"}
|
|
@@ -2,7 +2,7 @@ import * as React from 'react';
|
|
|
2
2
|
// import styles from './SourceSearch.module.scss';
|
|
3
3
|
import { SearchBox } from 'office-ui-fabric-react/lib/SearchBox';
|
|
4
4
|
import PageArrows from '../../Arrows/PageArrows';
|
|
5
|
-
require('
|
|
5
|
+
require('@mikezimm/fps-styles/dist/searchBoxRow.css');
|
|
6
6
|
const SourceSearchHook = (props) => {
|
|
7
7
|
const { searchText, searchTime, _onSearchChange, _updateFirstLastVisible, debugMode, resetArrows, itemsPerPage, itemCount, } = props;
|
|
8
8
|
// I don't think checking counts will work here as
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SearchBoxRow.js","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/component/SearchBoxRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,mDAAmD;AAEnD,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AAEjE,OAAO,UAAU,MAAM,yBAAyB,CAAC;AAEjD,OAAO,CAAG,
|
|
1
|
+
{"version":3,"file":"SearchBoxRow.js","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/component/SearchBoxRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,mDAAmD;AAEnD,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AAEjE,OAAO,UAAU,MAAM,yBAAyB,CAAC;AAEjD,OAAO,CAAG,4CAA4C,CAAC,CAAC;AA2CxD,MAAM,gBAAgB,GAAqC,CAAE,KAAK,EAAG,EAAE;IAErE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,uBAAuB,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,SAAS,GAAG,GAAG,KAAK,CAAC;IAErI,kDAAkD;IAClD,sFAAsF;IACtF,yEAAyE;IACzE,MAAM,UAAU,GAAG,oBAAC,UAAU,IAC5B,SAAS,EAAK,SAAS,EACvB,YAAY,EAAK,YAAY,EAC7B,uBAAuB,EAAK,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,EAC9D,SAAS,EAAK,SAAS,EACvB,QAAQ,EAAK,EAAE,EACf,WAAW,EAAK,WAAW,EAC3B,eAAe,EAAK,KAAK,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,GAC1E,CAAC;IAEH,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,qBAAqB,CAAC;IACjG,wEAAwE;IACxE,MAAM,SAAS,GACb,6BAAK,SAAS,EAAG,CAAE,cAAc,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC;QAC3C,oBAAC,SAAS,IACR,SAAS,EAAG,WAAW,EACvB,MAAM,EAAG,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAC,GAAG,EAAE,EAAE,EACnC,WAAW,EAAC,QAAQ,EACpB,KAAK,EAAG,UAAU,EAClB,QAAQ,EAAG,eAAe,EAC1B,OAAO,EAAG,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAG,EAC/C,MAAM,EAAG,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,EAC3C,QAAQ,EAAG,eAAe,EAC1B,OAAO,EAAG,eAAe,GACzB;QACF,6BAAK,SAAS,EAAG,cAAc;YAC3B,YAAY,GAAG,SAAS,GAAG,QAAQ;YACnC,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,GAAG,UAAU,GAAG,KAAK,CAExD;QACJ,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS;QACnD,UAAU;QACV,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CACnD,CAAC;IAET,OAAO,CAAE,SAAS,CAAE,CAAC;AAEvB,CAAC,CAAA;AAED,eAAe,gBAAgB,CAAC"}
|
|
@@ -1,3 +1,15 @@
|
|
|
1
1
|
export declare const RegexHashNumber: RegExp;
|
|
2
2
|
export declare const RegexXMLOpenProp: RegExp;
|
|
3
|
+
/**
|
|
4
|
+
* Common Regex examples
|
|
5
|
+
*/
|
|
6
|
+
export declare const RegexSpecial: RegExp;
|
|
7
|
+
export declare const RegexMathOps: RegExp;
|
|
8
|
+
export declare const RegexSquarBkt: RegExp;
|
|
9
|
+
export declare const RegexCurleys: RegExp;
|
|
10
|
+
export declare const RegexParenth: RegExp;
|
|
11
|
+
export declare const RegexSlashes: RegExp;
|
|
12
|
+
export declare const RegexQuotes: RegExp;
|
|
13
|
+
export declare const RegexSpaces: RegExp;
|
|
14
|
+
export declare const RegexWords: RegExp;
|
|
3
15
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/logic/Regex/constants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,QAAa,CAAC;AAI1C,eAAO,MAAM,gBAAgB,QAAgB,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/logic/Regex/constants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,QAAa,CAAC;AAI1C,eAAO,MAAM,gBAAgB,QAAgB,CAAC;AAM9C;;GAEG;AAGH,eAAO,MAAM,YAAY,QAA8B,CAAC;AAExD,eAAO,MAAM,YAAY,QAAe,CAAC;AAEzC,eAAO,MAAM,aAAa,QAAY,CAAC;AAEvC,eAAO,MAAM,YAAY,QAAW,CAAC;AAErC,eAAO,MAAM,YAAY,QAAW,CAAC;AAErC,eAAO,MAAM,YAAY,QAAa,CAAC;AAEvC,eAAO,MAAM,WAAW,QAAU,CAAC;AAEnC,eAAO,MAAM,WAAW,QAAW,CAAC;AAEpC,eAAO,MAAM,UAAU,QAAmB,CAAA"}
|
|
@@ -7,4 +7,17 @@ export const RegexXMLOpenProp = /[\"] [A-Z]/g;
|
|
|
7
7
|
//Used in /..Elements/markdown
|
|
8
8
|
// Moved this to src\logic\Strings\splitHash.ts where it is used
|
|
9
9
|
// export type INullOrStringArray = null | string[];
|
|
10
|
+
/**
|
|
11
|
+
* Common Regex examples
|
|
12
|
+
*/
|
|
13
|
+
// Replace most common special characters
|
|
14
|
+
export const RegexSpecial = /[.,;:?|=~!&^{}$%+_[\]-]+/g;
|
|
15
|
+
export const RegexMathOps = /[+*\/=-]+/g; // Replace basic math opts [ ]
|
|
16
|
+
export const RegexSquarBkt = /[[\]]+/g; // Replace brackets [ ]
|
|
17
|
+
export const RegexCurleys = /[{}]+/g; // Replace parentheses { }
|
|
18
|
+
export const RegexParenth = /[()]+/g; // Replace parentheses ( )
|
|
19
|
+
export const RegexSlashes = /[/\\]+/g; // Replace slashes / \
|
|
20
|
+
export const RegexQuotes = /[']+/g; // Replace quotes
|
|
21
|
+
export const RegexSpaces = /\s\s+/g; // Replace multiple spaces with just one
|
|
22
|
+
export const RegexWords = /\b([a-z]+)\b/gi; // Used to split a string by word boundaries only using a-z any case
|
|
10
23
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/logic/Regex/constants.ts"],"names":[],"mappings":"AACA,+DAA+D;AAE/D,kEAAkE;AAClE,MAAM,CAAC,MAAM,eAAe,GAAG,UAAU,CAAC,CAAG,sCAAsC;AAEnF,qGAAqG;AACrG,iEAAiE;AACjE,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,CAAC;AAE9C,8BAA8B;AAC9B,gEAAgE;AAChE,oDAAoD"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/logic/Regex/constants.ts"],"names":[],"mappings":"AACA,+DAA+D;AAE/D,kEAAkE;AAClE,MAAM,CAAC,MAAM,eAAe,GAAG,UAAU,CAAC,CAAG,sCAAsC;AAEnF,qGAAqG;AACrG,iEAAiE;AACjE,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,CAAC;AAE9C,8BAA8B;AAC9B,gEAAgE;AAChE,oDAAoD;AAEpD;;GAEG;AAEH,yCAAyC;AACzC,MAAM,CAAC,MAAM,YAAY,GAAG,2BAA2B,CAAC;AAExD,MAAM,CAAC,MAAM,YAAY,GAAG,YAAY,CAAC,CAAG,+BAA+B;AAE3E,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC,CAAG,wBAAwB;AAElE,MAAM,CAAC,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAK,2BAA2B;AAErE,MAAM,CAAC,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAK,2BAA2B;AAErE,MAAM,CAAC,MAAM,YAAY,GAAI,SAAS,CAAC,CAAG,sBAAsB;AAEhE,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC,CAAO,iBAAiB;AAE3D,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAM,wCAAwC;AAElF,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAA,CAAC,oEAAoE"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
/**
|
|
2
|
+
*
|
|
3
|
+
* get array of strings only (aka words) from the item proprty
|
|
4
|
+
Original code:
|
|
5
|
+
const keyVals: string[] = item[key].replace(/[0-9]/g, " ").split(/\b([a-z]+)\b/gi);
|
|
6
|
+
*
|
|
7
|
+
https://github.com/mikezimm/Compliance/issues/138
|
|
8
|
+
*
|
|
9
|
+
Test code: resulting in ["test","i","ng","as","dfasd","asdf"]
|
|
10
|
+
const item = 'test1234~321i~ng as?!_$dfasd. -++[asdf];?~!&^$%...,;'
|
|
11
|
+
const keyVals = item.replace(/[0-9.,;:?~!&^$%+_[\]-]/g, " ").replace(/\s\s+/g, ' ').split(/\b([a-z]+)\b/gi).filter( v => v.trim() !== '' );
|
|
12
|
+
console.log( keyVals )
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
* getStringArrayBasic is a simpler variation of getArrayOfWordsFromString
|
|
16
|
+
* This will use exact case and not filter duplicates .
|
|
17
|
+
* Finally it does not do any sorting.
|
|
18
|
+
*
|
|
19
|
+
* You can use getArrayOfWordsFromString IF YOU NEED any of those advanced options.
|
|
20
|
+
*
|
|
21
|
+
* @param baseStr
|
|
22
|
+
* @param removeDigits
|
|
23
|
+
* @returns
|
|
24
|
+
*/
|
|
25
|
+
export declare function getStringArrayBasic(baseStr: string, removeDigits: boolean): string[];
|
|
26
|
+
//# sourceMappingURL=getStringArrayBasic.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getStringArrayBasic.d.ts","sourceRoot":"","sources":["../../../src/logic/Strings/getStringArrayBasic.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,mBAAmB,CAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,GAAI,MAAM,EAAE,CAqBtF"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
/**
|
|
2
|
+
*
|
|
3
|
+
* get array of strings only (aka words) from the item proprty
|
|
4
|
+
Original code:
|
|
5
|
+
const keyVals: string[] = item[key].replace(/[0-9]/g, " ").split(/\b([a-z]+)\b/gi);
|
|
6
|
+
*
|
|
7
|
+
https://github.com/mikezimm/Compliance/issues/138
|
|
8
|
+
*
|
|
9
|
+
Test code: resulting in ["test","i","ng","as","dfasd","asdf"]
|
|
10
|
+
const item = 'test1234~321i~ng as?!_$dfasd. -++[asdf];?~!&^$%...,;'
|
|
11
|
+
const keyVals = item.replace(/[0-9.,;:?~!&^$%+_[\]-]/g, " ").replace(/\s\s+/g, ' ').split(/\b([a-z]+)\b/gi).filter( v => v.trim() !== '' );
|
|
12
|
+
console.log( keyVals )
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
* getStringArrayBasic is a simpler variation of getArrayOfWordsFromString
|
|
16
|
+
* This will use exact case and not filter duplicates .
|
|
17
|
+
* Finally it does not do any sorting.
|
|
18
|
+
*
|
|
19
|
+
* You can use getArrayOfWordsFromString IF YOU NEED any of those advanced options.
|
|
20
|
+
*
|
|
21
|
+
* @param baseStr
|
|
22
|
+
* @param removeDigits
|
|
23
|
+
* @returns
|
|
24
|
+
*/
|
|
25
|
+
export function getStringArrayBasic(baseStr, removeDigits) {
|
|
26
|
+
if (!baseStr)
|
|
27
|
+
return [];
|
|
28
|
+
if (removeDigits === true)
|
|
29
|
+
baseStr = baseStr.replace(/[0-9]/g, ' ');
|
|
30
|
+
baseStr = baseStr.replace(/[.,;:?~!&^$%+_[\]-]+/g, ' '); // Replace most common special characters
|
|
31
|
+
baseStr = baseStr.replace(/[()]+/g, ' '); // Replace most common special characters
|
|
32
|
+
baseStr = baseStr.replace(/[/\\]+/g, ' '); // Replace most common special characters
|
|
33
|
+
baseStr = baseStr.replace(/[']+/g, ' '); // Replace most common special characters
|
|
34
|
+
baseStr = baseStr.replace(/\s\s+/g, ' '); // Replace multiple spaces with just one
|
|
35
|
+
// get array of original trimmed words and exclude empties
|
|
36
|
+
const originalWords = baseStr.split(/\b([a-z]+)\b/gi)
|
|
37
|
+
.map(word => { return word.trim(); }).filter(word => { return word; });
|
|
38
|
+
// NOTE: getSuggestionsByKeys used this code which may also be valid... seemed to work in testing
|
|
39
|
+
// .filter( ( v: string ) => v.trim() !== '' ); // then remove spaces and empties
|
|
40
|
+
return originalWords;
|
|
41
|
+
}
|
|
42
|
+
//# sourceMappingURL=getStringArrayBasic.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getStringArrayBasic.js","sourceRoot":"","sources":["../../../src/logic/Strings/getStringArrayBasic.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,UAAU,mBAAmB,CAAE,OAAe,EAAE,YAAqB;IAEzE,IAAK,CAAC,OAAO;QAAG,OAAO,EAAE,CAAC;IAE1B,IAAK,YAAY,KAAK,IAAI;QAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACtE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAE,uBAAuB,EAAE,GAAG,CAAE,CAAC,CAAC,yCAAyC;IACpG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAE,QAAQ,EAAE,GAAG,CAAE,CAAC,CAAC,yCAAyC;IACrF,OAAO,GAAG,OAAO,CAAC,OAAO,CAAE,SAAS,EAAE,GAAG,CAAE,CAAC,CAAC,yCAAyC;IACtF,OAAO,GAAG,OAAO,CAAC,OAAO,CAAE,OAAO,EAAE,GAAG,CAAE,CAAC,CAAC,yCAAyC;IAEpF,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,wCAAwC;IAElF,0DAA0D;IAC1D,MAAM,aAAa,GAAa,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC;SAC5D,GAAG,CAAE,IAAI,CAAC,EAAE,GAAG,OAAO,IAAI,CAAC,IAAI,EAAE,CAAA,CAAC,CAAC,CAAE,CAAC,MAAM,CAAE,IAAI,CAAC,EAAE,GAAG,OAAO,IAAI,CAAA,CAAC,CAAC,CAAE,CAAC;IAEzE,kGAAkG;IAClG,iFAAiF;IAEnF,OAAO,aAAa,CAAC;AAEvB,CAAC"}
|
|
@@ -9,6 +9,20 @@ import { ISeriesSort } from "../../logic/Arrays/sorting/Interfaces";
|
|
|
9
9
|
* @returns array of words found
|
|
10
10
|
*/
|
|
11
11
|
export declare function mergeArrayOfWordsFromString(str: string, intoThese: string[], removeDigits: boolean, removeDups: boolean, ignoreCase: boolean, order: ISeriesSort, localLanguage?: string): string[];
|
|
12
|
+
/**
|
|
13
|
+
* getArrayOfWordsFromString is a more advanced variation of getStringArrayBasic
|
|
14
|
+
* This will check for duplicates and also allow for using or ignoring case.
|
|
15
|
+
* Finally it also provides a built in option to sort.
|
|
16
|
+
*
|
|
17
|
+
* You can use getStringArrayBasic if you do not need any of those advanced options but to just split into words.
|
|
18
|
+
* @param str
|
|
19
|
+
* @param removeDigits
|
|
20
|
+
* @param removeDups
|
|
21
|
+
* @param ignoreCase
|
|
22
|
+
* @param order
|
|
23
|
+
* @param localLanguage
|
|
24
|
+
* @returns
|
|
25
|
+
*/
|
|
12
26
|
export declare function getArrayOfWordsFromString(str: string, removeDigits: boolean, removeDups: boolean, ignoreCase: boolean, order: ISeriesSort, localLanguage?: string): string[];
|
|
13
27
|
export declare function mergeWordArrays(mergeThese: string[], intoThese: string[], ignoreCase: boolean, order: ISeriesSort, localLanguage?: string): string[];
|
|
14
28
|
//# sourceMappingURL=getWordsFromString.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getWordsFromString.d.ts","sourceRoot":"","sources":["../../../src/logic/Strings/getWordsFromString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"getWordsFromString.d.ts","sourceRoot":"","sources":["../../../src/logic/Strings/getWordsFromString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAIpE;;;;;;;;GAQG;AAEH,wBAAgB,2BAA2B,CAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,GAAE,MAAa,GAAI,MAAM,EAAE,CAO3M;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,yBAAyB,CAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,GAAE,MAAa,GAAI,MAAM,EAAE,CAiDpL;AAED,wBAAgB,eAAe,CAAE,UAAU,EAAE,MAAM,EAAE,EAAE,SAAS,EAAC,MAAM,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,GAAE,MAAa,GAAI,MAAM,EAAE,CAiB3J"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { sortStringArrayCollator } from "../../logic/Arrays/sorting/strings";
|
|
2
|
+
import { getStringArrayBasic } from "./getStringArrayBasic";
|
|
2
3
|
/**
|
|
3
4
|
*
|
|
4
5
|
* Originally used in Compliance to get list of words from a string
|
|
@@ -15,20 +16,34 @@ export function mergeArrayOfWordsFromString(str, intoThese, removeDigits, remove
|
|
|
15
16
|
const results = mergeWordArrays(theseWords, intoThese, ignoreCase, order, localLanguage);
|
|
16
17
|
return results;
|
|
17
18
|
}
|
|
19
|
+
/**
|
|
20
|
+
* getArrayOfWordsFromString is a more advanced variation of getStringArrayBasic
|
|
21
|
+
* This will check for duplicates and also allow for using or ignoring case.
|
|
22
|
+
* Finally it also provides a built in option to sort.
|
|
23
|
+
*
|
|
24
|
+
* You can use getStringArrayBasic if you do not need any of those advanced options but to just split into words.
|
|
25
|
+
* @param str
|
|
26
|
+
* @param removeDigits
|
|
27
|
+
* @param removeDups
|
|
28
|
+
* @param ignoreCase
|
|
29
|
+
* @param order
|
|
30
|
+
* @param localLanguage
|
|
31
|
+
* @returns
|
|
32
|
+
*/
|
|
18
33
|
export function getArrayOfWordsFromString(str, removeDigits, removeDups, ignoreCase, order, localLanguage = 'en') {
|
|
19
34
|
const results = [];
|
|
20
35
|
if (!str)
|
|
21
36
|
return results;
|
|
22
|
-
let baseStr = `${str}`;
|
|
23
|
-
if (removeDigits === true)
|
|
24
|
-
|
|
25
|
-
baseStr = baseStr.replace(/[
|
|
26
|
-
baseStr = baseStr.replace(/[
|
|
27
|
-
baseStr = baseStr.replace(/[
|
|
28
|
-
baseStr = baseStr.replace(
|
|
29
|
-
|
|
30
|
-
//
|
|
31
|
-
const originalWords =
|
|
37
|
+
// let baseStr = `${str}`;
|
|
38
|
+
// if ( removeDigits === true ) baseStr = baseStr.replace(/[0-9]/g, ' ');
|
|
39
|
+
// baseStr = baseStr.replace( /[-_,&[\]]+/g, ' ' ); // Replace most common special characters
|
|
40
|
+
// baseStr = baseStr.replace( /[()]+/g, ' ' ); // Replace most common special characters
|
|
41
|
+
// baseStr = baseStr.replace( /[/\\]+/g, ' ' ); // Replace most common special characters
|
|
42
|
+
// baseStr = baseStr.replace( /[']+/g, ' ' ); // Replace most common special characters
|
|
43
|
+
// baseStr = baseStr.replace(/\s\s+/g, ' '); // Replace multiple spaces with just one
|
|
44
|
+
// // get array of original trimmed words and exclude empties
|
|
45
|
+
// const originalWords: string[] = baseStr.split(/\b([a-z]+)\b/gi).map( word => { return word.trim() } ).filter( word => { return word } );
|
|
46
|
+
const originalWords = getStringArrayBasic(`${str}`, removeDigits);
|
|
32
47
|
// Correct case of compare array of strings from str
|
|
33
48
|
let originalCompareWords = ignoreCase === true ? originalWords.map(item => { return item.toLocaleLowerCase(); }) : originalWords;
|
|
34
49
|
originalCompareWords = removeDups === true ? originalCompareWords.filter(item => { return item.toLocaleLowerCase(); }) : originalCompareWords;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getWordsFromString.js","sourceRoot":"","sources":["../../../src/logic/Strings/getWordsFromString.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"getWordsFromString.js","sourceRoot":"","sources":["../../../src/logic/Strings/getWordsFromString.ts"],"names":[],"mappings":"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"}
|