@mikezimm/fps-library-v2 1.0.143 → 1.0.144
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 +6 -1
- package/lib/components/molecules/SearchPage/Interfaces/ProgrammingFileKeys.js +2 -2
- package/lib/components/molecules/SearchPage/Interfaces/ProgrammingFileKeys.js.map +1 -1
- package/lib/components/molecules/SearchPage/functions/addItemIsA.d.ts.map +1 -1
- package/lib/components/molecules/SearchPage/functions/addItemIsA.js +6 -6
- package/lib/components/molecules/SearchPage/functions/addItemIsA.js.map +1 -1
- package/lib/components/molecules/SearchPage/functions/addSearchMeta2.d.ts.map +1 -1
- package/lib/components/molecules/SearchPage/functions/addSearchMeta2.js +3 -0
- package/lib/components/molecules/SearchPage/functions/addSearchMeta2.js.map +1 -1
- package/lib/logic/Strings/getWordsFromString.js +3 -3
- package/lib/logic/Strings/getWordsFromString.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -5,12 +5,17 @@ npm run build
|
|
|
5
5
|
npm version major/minor/patch
|
|
6
6
|
npm publish --access=public
|
|
7
7
|
|
|
8
|
-
npm install @mikezimm/fps-library-v2@1.0.
|
|
8
|
+
npm install @mikezimm/fps-library-v2@1.0.144
|
|
9
9
|
|
|
10
10
|
# Changelog
|
|
11
11
|
|
|
12
12
|
NOTE: TURN BACK ON STRICT NULL CHECKS - turned off for PropPaneCols
|
|
13
13
|
|
|
14
|
+
## 1.0.144 - 2023-Mar-20: SearchTypes
|
|
15
|
+
- refactor addItemIsA to simplify code ( put updates in if item.meta .... )
|
|
16
|
+
- update addSearchMeta2 - map item.allIsAKeys into meta in case it was not already added
|
|
17
|
+
- change ItemIsDataContent from xml file to json in components\molecules\SearchPage\Interfaces\ProgrammingFileKeys.ts
|
|
18
|
+
|
|
14
19
|
## 1.0.143 - 2023-Mar-20: SearchTypes
|
|
15
20
|
- add to IAnySourceItem: primarySearchType: ISearchType; searchTypes: ISearchType[]; allIsAKeys: IItemIsAValues[];
|
|
16
21
|
- add to ISearchType: isAKeys: IItemIsAValues[]; update all default constants
|
|
@@ -19,8 +19,8 @@ export const ProgrammingFileSearchTypes = [
|
|
|
19
19
|
{ key: "js", title: "js", icon: "JS", style: "", count: 0, color: "blue", similarKey: 'js', contentGroup: ContentGroupCode, isAKeys: ['ItemIsAFile', 'ItemIsCodeContent'] },
|
|
20
20
|
{ key: "html", title: "html", icon: "FileHTML", style: "", count: 0, color: "blue", similarKey: 'html', contentGroup: ContentGroupCode, isAKeys: ['ItemIsAFile', 'ItemIsCodeContent'] },
|
|
21
21
|
{ key: "css", title: "css", icon: "CSS", style: "", count: 0, color: "blue", similarKey: 'css', contentGroup: ContentGroupCode, isAKeys: ['ItemIsAFile', 'ItemIsCodeContent'] },
|
|
22
|
-
{ key: "json", title: "json", icon: "Code", style: "", count: 0, color: "blue", similarKey: 'json', contentGroup: ContentGroupData, isAKeys: ['ItemIsAFile', 'ItemIsCodeContent'] },
|
|
23
|
-
{ key: "xml", title: "xml", icon: "CalculatorMultiply", style: "", count: 0, color: "blue", similarKey: 'xml', contentGroup: ContentGroupCode, isAKeys: ['ItemIsAFile', 'ItemIsCodeContent'
|
|
22
|
+
{ key: "json", title: "json", icon: "Code", style: "", count: 0, color: "blue", similarKey: 'json', contentGroup: ContentGroupData, isAKeys: ['ItemIsAFile', 'ItemIsCodeContent', 'ItemIsDataContent'] },
|
|
23
|
+
{ key: "xml", title: "xml", icon: "CalculatorMultiply", style: "", count: 0, color: "blue", similarKey: 'xml', contentGroup: ContentGroupCode, isAKeys: ['ItemIsAFile', 'ItemIsCodeContent'] },
|
|
24
24
|
{ key: "exe", title: "exe", icon: "CSharpLanguage", style: "", count: 0, color: "blue", similarKey: 'exe', contentGroup: ContentGroupCode, isAKeys: ['ItemIsAFile', 'ItemIsCodeContent'] },
|
|
25
25
|
{ key: "ps1", title: "ps1", icon: "PowerShell2", style: "", count: 0, color: "blue", similarKey: 'ps1', contentGroup: ContentGroupCode, isAKeys: ['ItemIsAFile', 'ItemIsCodeContent'] },
|
|
26
26
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProgrammingFileKeys.js","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/Interfaces/ProgrammingFileKeys.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ProgrammingFileKeys.js","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/Interfaces/ProgrammingFileKeys.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addItemIsA.d.ts","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/functions/addItemIsA.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAiH,MAAM,8BAA8B,CAAC;AAI7L,wBAAgB,UAAU,CAAC,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,GAAG,cAAc,
|
|
1
|
+
{"version":3,"file":"addItemIsA.d.ts","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/functions/addItemIsA.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAiH,MAAM,8BAA8B,CAAC;AAI7L,wBAAgB,UAAU,CAAC,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,GAAG,cAAc,CAuB5F;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,cAAc,GAAG,cAAc,CAuBpE"}
|
|
@@ -8,14 +8,14 @@ export function addItemIsA(item, ItemIsAThis) {
|
|
|
8
8
|
}
|
|
9
9
|
else {
|
|
10
10
|
const itemIsAKey = ItemIsAKeys[itemIsAIdx];
|
|
11
|
-
item.
|
|
12
|
-
if (item.meta.indexOf(ItemIsAThis) < 0)
|
|
11
|
+
if (item.meta.indexOf(ItemIsAThis) < 0) {
|
|
13
12
|
item.meta.push(ItemIsAThis);
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
item.allIsAKeys
|
|
17
|
-
|
|
13
|
+
item.searchTextLC = `${ItemIsAThis.toLocaleLowerCase()} || ${item.searchTextLC}`;
|
|
14
|
+
item[`${itemIsAKey}`] = true;
|
|
15
|
+
if (!item.allIsAKeys)
|
|
16
|
+
item.allIsAKeys = [];
|
|
18
17
|
item.allIsAKeys.push(ItemIsAThis);
|
|
18
|
+
}
|
|
19
19
|
return item;
|
|
20
20
|
}
|
|
21
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addItemIsA.js","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/functions/addItemIsA.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAC7L,OAAO,EAAE,sBAAsB,GAAG,MAAM,mCAAmC,CAAC;AAG5E,MAAM,UAAU,UAAU,CAAC,IAAoB,EAAE,WAA2B;IAE1E,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,WAA6B,CAAC,CAAC;IAExE,IAAI,UAAU,GAAG,CAAC,EAAE;QAClB,OAAO,CAAC,GAAG,CAAC,kCAAkC,EAAE,WAAW,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC;KAEb;SAAM;QACL,MAAM,UAAU,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"addItemIsA.js","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/functions/addItemIsA.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAC7L,OAAO,EAAE,sBAAsB,GAAG,MAAM,mCAAmC,CAAC;AAG5E,MAAM,UAAU,UAAU,CAAC,IAAoB,EAAE,WAA2B;IAE1E,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,WAA6B,CAAC,CAAC;IAExE,IAAI,UAAU,GAAG,CAAC,EAAE;QAClB,OAAO,CAAC,GAAG,CAAC,kCAAkC,EAAE,WAAW,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC;KAEb;SAAM;QACL,MAAM,UAAU,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QAE3C,IAAK,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,EAAG;YACxC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC5B,IAAI,CAAC,YAAY,GAAG,GAAG,WAAW,CAAC,iBAAiB,EAAE,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;YACjF,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,GAAG,IAAI,CAAC;YAC7B,IAAK,CAAC,IAAI,CAAC,UAAU;gBAAG,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;YAC7C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAE,WAAW,CAAE,CAAC;SACrC;QAED,OAAO,IAAI,CAAC;KACb;AAGH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAoB;IAElD,MAAM,YAAY,GAAG,IAAI,CAAC,sBAAsB,IAAI,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;IACrH,IAAI,YAAY,KAAK,IAAI,EAAE;QACzB,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;KAEvC;SAAM;QACL,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;KACvC;IAAA,CAAC;IAEF,IAAI,IAAI,CAAC,aAAa,KAAK,CAAC,EAAE;QAC5B,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;KAE5C;SAAM,IAAI,IAAI,CAAC,aAAa,KAAK,CAAC,EAAE;QACnC,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;KAC1C;IAED,IAAI,IAAI,CAAC,iBAAiB,CAAC,IAAI,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE;QAC3F,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;KAC5C;IAED,OAAO,IAAI,CAAC;AAEd,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addSearchMeta2.d.ts","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/functions/addSearchMeta2.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAkB,MAAM,8BAA8B,CAAC;AAC9E,OAAO,EAAe,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAGvE;;;;;GAKG;AAEH,wBAAgB,cAAc,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE,WAAW,EAAE,YAAY,GAAG,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"addSearchMeta2.d.ts","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/functions/addSearchMeta2.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAkB,MAAM,8BAA8B,CAAC;AAC9E,OAAO,EAAe,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAGvE;;;;;GAKG;AAEH,wBAAgB,cAAc,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE,WAAW,EAAE,YAAY,GAAG,cAAc,EAAE,CA+DnG"}
|
|
@@ -61,6 +61,9 @@ export function addSearchMeta2(items, SearchTypes) {
|
|
|
61
61
|
// Merge allIsAKeys from this Search Type with the Item's allIsAKeys
|
|
62
62
|
item.allIsAKeys = mergeWordArrays(SearchTypes.objs[searchTypeIdx].isAKeys, item.allIsAKeys, false, 'asis');
|
|
63
63
|
}
|
|
64
|
+
// This was added to insure all allIsKeys get pushed to meta if they have not already been pushed.
|
|
65
|
+
item.allIsAKeys.map(key => { if (item.meta.indexOf(key) < 0)
|
|
66
|
+
item.meta.push(key); });
|
|
64
67
|
item.typeIdx = typeIdx > -1 ? typeIdx : SearchTypes.keys.length - 1;
|
|
65
68
|
item.searchTypeIdx = searchTypeIdx;
|
|
66
69
|
item.searchTitle = `${searchTitle}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addSearchMeta2.js","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/functions/addSearchMeta2.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iDAAiD,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAG/E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C;;;;;GAKG;AAEH,MAAM,UAAU,cAAc,CAAC,KAAuB,EAAE,WAAyB;IAE/E,KAAK,CAAC,GAAG,CAAC,CAAC,IAAoB,EAAE,EAAE;QAEjC,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QACnD;;WAEG;QACH,4FAA4F;QAC5F,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,MAAM,EAAE;YAAE,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC;SAAE;QAC/D,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,EAAE;YAAE,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;SAAE,CAAC,uDAAuD;QAC9K,IAAI,CAAC,UAAU,EAAE;YAAE,UAAU,GAAG,EAAE,CAAC;SAAE;QAErC,IAAI,CAAC,UAAU,EAAE;YACf,IAAI,IAAI,CAAC,wBAAwB,EAAE;gBAAE,UAAU,GAAG,IAAI,CAAC,wBAAwB,CAAC;aAAE;iBAC7E,IAAI,IAAI,CAAC,OAAO,EAAE;gBAAE,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC;aAAE;iBAChD,IAAI,IAAI,CAAC,wBAAwB,CAAC,EAAE;gBAAE,UAAU,GAAG,IAAI,CAAC,wBAAwB,CAAC,CAAC;aAAE;SAE1F;QAED,IAAI,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,OAAO,GAAG,aAAa,CAAC;QAC5B,IAAI,aAAa,KAAK,CAAC,CAAC,EAAE;YACxB,IAAK,UAAU,EAAE,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU;gBAAG,OAAO,CAAC,GAAG,CAAC,kCAAkC,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;SACjK;QAED,oGAAoG;QACpG,IAAK,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,EAAG;YACrC,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACtG,OAAO,GAAG,aAAa,GAAG,SAAS,CAAC;YACpC,IAAK,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,YAAY,EAAG;gBAClD,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,YAAY,CAAC;gBACjE,IAAI,GAAG,UAAU,CAAE,IAAI,EAAE,SAAS,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,YAAY,SAAS,CAAE,CAAC;aAC3F;YACD,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACzD,IAAK,CAAC,IAAI,CAAC,WAAW;gBAAG,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;YAC/C,IAAK,CAAC,IAAI,CAAC,UAAU;gBAAG,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;YAE7C,2DAA2D;YAC3D,MAAM,wBAAwB,GAAkB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAE,CAAE,KAAkB,EAAG,EAAE,GAAG,OAAO,KAAK,CAAC,GAAG,KAAK,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,GAAG,CAAA,CAAC,CAAC,CAAE,CAAC;YAElK,gDAAgD;YAChD,IAAK,wBAAwB,CAAC,MAAM,KAAK,CAAC;gBAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAE,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAE,CAAC;YAEtG,oEAAoE;YACpE,IAAI,CAAC,UAAU,GAAG,eAAe,CAAE,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,CAAsB,CAAC;SAElI;
|
|
1
|
+
{"version":3,"file":"addSearchMeta2.js","sourceRoot":"","sources":["../../../../../src/components/molecules/SearchPage/functions/addSearchMeta2.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,9 +49,9 @@ export function getArrayOfWordsFromString(str, removeDigits, removeDups, ignoreC
|
|
|
49
49
|
return finalVals;
|
|
50
50
|
}
|
|
51
51
|
export function mergeWordArrays(mergeThese, intoThese, ignoreCase, order, localLanguage = 'en') {
|
|
52
|
-
let finalWords = intoThese;
|
|
53
|
-
const finalCompareWords = ignoreCase === true ? finalWords.map(item => { return item.toLocaleLowerCase(); }) : finalWords;
|
|
54
|
-
const mergeTheseCompare = ignoreCase === true ? mergeThese.map(item => { return item.toLocaleLowerCase(); }) : mergeThese;
|
|
52
|
+
let finalWords = [...intoThese];
|
|
53
|
+
const finalCompareWords = ignoreCase === true ? finalWords.map(item => { return item.toLocaleLowerCase(); }) : [...finalWords];
|
|
54
|
+
const mergeTheseCompare = ignoreCase === true ? mergeThese.map(item => { return item.toLocaleLowerCase(); }) : [...mergeThese];
|
|
55
55
|
// Now compare the filteredNewWords with the finalWords and only add ones that are not a duplicate.
|
|
56
56
|
mergeTheseCompare.map((compareWord, index) => {
|
|
57
57
|
if (finalCompareWords.indexOf(compareWord) === -1) {
|
|
@@ -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;AAG7E;;;;;;;GAOG;AAEH,MAAM,UAAU,2BAA2B,CAAE,GAAW,EAAE,SAAmB,EAAE,YAAqB,EAAE,UAAmB,EAAE,UAAmB,EAAE,KAAkB,EAAE,gBAAwB,IAAI;IAE9L,IAAK,CAAC,GAAG;QAAG,OAAO,EAAE,CAAC;IACtB,MAAM,UAAU,GAAa,yBAAyB,CAAE,GAAG,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,CAAE,CAAC;IAC1H,MAAM,OAAO,GAAa,eAAe,CAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,CAAE,CAAC;IACrG,OAAO,OAAO,CAAC;AAEjB,CAAC;AAGD,MAAM,UAAU,yBAAyB,CAAE,GAAW,EAAE,YAAqB,EAAE,UAAmB,EAAE,UAAmB,EAAE,KAAkB,EAAE,gBAAwB,IAAI;IACvK,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAK,CAAC,GAAG;QAAG,OAAO,OAAO,CAAC;IAC3B,IAAI,OAAO,GAAG,GAAG,GAAG,EAAE,CAAC;IACvB,IAAK,YAAY,KAAK,IAAI;QAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAEtE,MAAM,aAAa,GAAa,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAEhE,oDAAoD;IACpD,IAAI,oBAAoB,GAAa,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAE,IAAI,CAAC,EAAE,GAAG,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAA,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,aAAa,CAAC;IAC5I,oBAAoB,GAAG,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAE,IAAI,CAAC,EAAE,GAAG,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAA,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC;IAE/I,IAAI,SAAS,GAAa,EAAE,CAAC;IAE7B,kEAAkE;IAClE,2HAA2H;IAE3H,IAAK,UAAU,KAAK,IAAI,EAAG;QACzB,+EAA+E;QAC/E,SAAS,GAAG,CAAE,GAAG,SAAS,EAAE,GAAG,aAAa,CAAE,CAAE;KAEjD;SAAM;QAEL,MAAM,oBAAoB,GAAa,EAAE,CAAC,CAAE,2EAA2E;QAEvH,2CAA2C;QAC3C,aAAa,CAAC,GAAG,CAAE,CAAE,IAAY,EAAE,KAAa,EAAG,EAAE;YACjD,MAAM,QAAQ,GAAG,oBAAoB,CAAE,KAAK,CAAE,CAAC;YAC/C,2DAA2D;YAC3D,IAAK,oBAAoB,CAAC,OAAO,CAAE,QAAQ,CAAE,KAAK,CAAC,CAAC,EAAG;gBACrD,SAAS,CAAC,IAAI,CAAE,IAAI,CAAE,CAAE;gBACxB,oBAAoB,CAAC,IAAI,CAAE,QAAQ,CAAE,CAAC;aACvC;QACL,CAAC,CAAC,CAAC;KAEJ;IAED,IAAK,KAAK,KAAK,MAAM;QAAG,SAAS,GAAG,uBAAuB,CAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,aAAa,CAAE,CAAC;IAEtG,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,eAAe,CAAE,UAAoB,EAAE,SAAkB,EAAE,UAAmB,EAAE,KAAkB,EAAE,gBAAwB,IAAI;IAC9I,IAAI,UAAU,GAAa,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"getWordsFromString.js","sourceRoot":"","sources":["../../../src/logic/Strings/getWordsFromString.ts"],"names":[],"mappings":"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"}
|