@redneckz/wildless-cms-uni-blocks 0.14.844 → 0.14.845
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/bundle/bundle.umd.js +7 -6
- package/bundle/bundle.umd.min.js +1 -1
- package/dist/services/search/useSearch.js +8 -5
- package/dist/services/search/useSearch.js.map +1 -1
- package/lib/services/search/useSearch.js +8 -5
- package/lib/services/search/useSearch.js.map +1 -1
- package/mobile/bundle/bundle.umd.js +1 -1
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/dist/services/search/useSearch.js +8 -5
- package/mobile/dist/services/search/useSearch.js.map +1 -1
- package/mobile/lib/services/search/useSearch.js +8 -5
- package/mobile/lib/services/search/useSearch.js.map +1 -1
- package/mobile/src/services/search/useSearch.ts +33 -22
- package/package.json +1 -1
- package/src/services/search/useSearch.ts +33 -22
|
@@ -3,18 +3,21 @@ exports.useSearch = void 0;
|
|
|
3
3
|
const hooks_1 = require("@redneckz/uni-jsx/lib/hooks");
|
|
4
4
|
const useAsyncData_1 = require("@redneckz/uni-jsx/lib/hooks/useAsyncData");
|
|
5
5
|
const useDebouncedEffect_1 = require("@redneckz/uni-jsx/lib/hooks/useDebouncedEffect");
|
|
6
|
+
const useRouter_1 = require("../../external/useRouter");
|
|
7
|
+
const adjustHref_1 = require("../../utils/adjustHref");
|
|
6
8
|
const fetchJSON_1 = require("../../utils/fetchJSON");
|
|
7
9
|
const url_1 = require("../../utils/url");
|
|
8
10
|
const search_1 = require("./search");
|
|
9
11
|
const SEARCH_INDEX_FILENAME = 'search.index.json';
|
|
10
12
|
const useSearch = ({ basePathList, initialQuery = '', }) => {
|
|
11
13
|
const [query, setQuery] = (0, hooks_1.useState)(initialQuery || '');
|
|
14
|
+
const router = (0, useRouter_1.useRouter)();
|
|
12
15
|
(0, hooks_1.useEffect)(() => {
|
|
13
16
|
if (initialQuery !== undefined && initialQuery !== null) {
|
|
14
17
|
setQuery(initialQuery);
|
|
15
18
|
}
|
|
16
19
|
}, [initialQuery]);
|
|
17
|
-
const { data } = (0, useAsyncData_1.useAsyncData)(basePathList?.length ? basePathList : null, fetchSearchIndex);
|
|
20
|
+
const { data } = (0, useAsyncData_1.useAsyncData)(basePathList?.length ? basePathList : null, fetchSearchIndex(router));
|
|
18
21
|
const [result, setResult] = (0, hooks_1.useState)(null);
|
|
19
22
|
(0, useDebouncedEffect_1.useDebouncedEffect)(() => {
|
|
20
23
|
if (data) {
|
|
@@ -24,13 +27,13 @@ const useSearch = ({ basePathList, initialQuery = '', }) => {
|
|
|
24
27
|
return [result, { value: query, onChange: setQuery }];
|
|
25
28
|
};
|
|
26
29
|
exports.useSearch = useSearch;
|
|
27
|
-
const fetchSearchIndex = async (...basePathList) => (await Promise.allSettled(basePathList.map(async (basePath) => [
|
|
30
|
+
const fetchSearchIndex = (router) => async (...basePathList) => (await Promise.allSettled(basePathList.map(async (basePath) => [
|
|
28
31
|
basePath,
|
|
29
32
|
await (0, fetchJSON_1.fetchJSON)((0, url_1.joinPath)(basePath, SEARCH_INDEX_FILENAME)),
|
|
30
33
|
])))
|
|
31
34
|
.map((_) => (_.status === 'fulfilled' ? _.value : []))
|
|
32
|
-
.map(getSearchIndex);
|
|
33
|
-
const getSearchIndex = ([basePath, result]) => {
|
|
35
|
+
.map(getSearchIndex(router));
|
|
36
|
+
const getSearchIndex = (router) => ([basePath, result]) => {
|
|
34
37
|
if (!result) {
|
|
35
38
|
return {};
|
|
36
39
|
}
|
|
@@ -38,7 +41,7 @@ const getSearchIndex = ([basePath, result]) => {
|
|
|
38
41
|
...result,
|
|
39
42
|
corpus: result.corpus?.map((_) => ({
|
|
40
43
|
..._,
|
|
41
|
-
uri: _.uri === 'index' ? basePath : (0,
|
|
44
|
+
uri: _.uri === 'index' ? basePath : (0, adjustHref_1.adjustHref)(router)(_.uri, basePath),
|
|
42
45
|
})),
|
|
43
46
|
};
|
|
44
47
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSearch.js","sourceRoot":"","sources":["../../../src/services/search/useSearch.ts"],"names":[],"mappings":";;AAAA,uDAAkE;AAClE,2EAAwE;AACxE,uFAAoF;AACpF,qDAAkD;AAElD,yCAA2C;AAC3C,qCAAqE;AAErE,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAgB3C,MAAM,SAAS,GAAG,CAAC,EACxB,YAAY,EACZ,YAAY,GAAG,EAAE,GACJ,EAA2C,EAAE;IAC1D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,EAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IAEvD,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,IAAI,EAAE;YACvD,QAAQ,CAAC,YAAY,CAAC,CAAC;SACxB;IACH,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,2BAAY,
|
|
1
|
+
{"version":3,"file":"useSearch.js","sourceRoot":"","sources":["../../../src/services/search/useSearch.ts"],"names":[],"mappings":";;AAAA,uDAAkE;AAClE,2EAAwE;AACxE,uFAAoF;AACpF,wDAAkE;AAClE,uDAAoD;AACpD,qDAAkD;AAElD,yCAA2C;AAC3C,qCAAqE;AAErE,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAgB3C,MAAM,SAAS,GAAG,CAAC,EACxB,YAAY,EACZ,YAAY,GAAG,EAAE,GACJ,EAA2C,EAAE;IAC1D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,EAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IAEvD,MAAM,MAAM,GAAG,IAAA,qBAAS,GAAE,CAAC;IAE3B,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,IAAI,EAAE;YACvD,QAAQ,CAAC,YAAY,CAAC,CAAC;SACxB;IACH,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,2BAAY,EAC3B,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAC1C,gBAAgB,CAAC,MAAM,CAAC,CACzB,CAAC;IAEF,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAsB,IAAI,CAAC,CAAC;IAEhE,IAAA,uCAAkB,EAAC,GAAG,EAAE;QACtB,IAAI,IAAI,EAAE;YACR,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,IAAA,eAAM,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACpC;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IAElB,OAAO,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;AACxD,CAAC,CAAC;AA5BW,QAAA,SAAS,aA4BpB;AAEF,MAAM,gBAAgB,GACpB,CAAC,MAAc,EAAE,EAAE,CACnB,KAAK,EAAE,GAAG,YAA+B,EAA0B,EAAE,CACnE,CACE,MAAM,OAAO,CAAC,UAAU,CACtB,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC;IACnC,QAAQ;IACR,MAAM,IAAA,qBAAS,EAAC,IAAA,cAAQ,EAAC,QAAQ,EAAE,qBAAqB,CAAC,CAAC;CAC3D,CAAC,CACH,CACF;KACE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAA2B,CAAC;KAC/E,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;AAEnC,MAAM,cAAc,GAClB,CAAC,MAAc,EAAE,EAAE,CACnB,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAyB,EAAe,EAAE;IAC1D,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,EAAE,CAAC;KACX;IAED,OAAO;QACL,GAAG,MAAM;QACT,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACjC,GAAG,CAAC;YACJ,GAAG,EAAE,CAAC,CAAC,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC;SACxE,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,18 +1,21 @@
|
|
|
1
1
|
import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
|
|
2
2
|
import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
|
|
3
3
|
import { useDebouncedEffect } from '@redneckz/uni-jsx/lib/hooks/useDebouncedEffect';
|
|
4
|
+
import { useRouter } from '../../external/useRouter.js';
|
|
5
|
+
import { adjustHref } from '../../utils/adjustHref.js';
|
|
4
6
|
import { fetchJSON } from '../../utils/fetchJSON.js';
|
|
5
7
|
import { joinPath } from '../../utils/url.js';
|
|
6
8
|
import { search } from './search.js';
|
|
7
9
|
const SEARCH_INDEX_FILENAME = 'search.index.json';
|
|
8
10
|
export const useSearch = ({ basePathList, initialQuery = '', }) => {
|
|
9
11
|
const [query, setQuery] = useState(initialQuery || '');
|
|
12
|
+
const router = useRouter();
|
|
10
13
|
useEffect(() => {
|
|
11
14
|
if (initialQuery !== undefined && initialQuery !== null) {
|
|
12
15
|
setQuery(initialQuery);
|
|
13
16
|
}
|
|
14
17
|
}, [initialQuery]);
|
|
15
|
-
const { data } = useAsyncData(basePathList?.length ? basePathList : null, fetchSearchIndex);
|
|
18
|
+
const { data } = useAsyncData(basePathList?.length ? basePathList : null, fetchSearchIndex(router));
|
|
16
19
|
const [result, setResult] = useState(null);
|
|
17
20
|
useDebouncedEffect(() => {
|
|
18
21
|
if (data) {
|
|
@@ -21,13 +24,13 @@ export const useSearch = ({ basePathList, initialQuery = '', }) => {
|
|
|
21
24
|
}, [data, query]);
|
|
22
25
|
return [result, { value: query, onChange: setQuery }];
|
|
23
26
|
};
|
|
24
|
-
const fetchSearchIndex = async (...basePathList) => (await Promise.allSettled(basePathList.map(async (basePath) => [
|
|
27
|
+
const fetchSearchIndex = (router) => async (...basePathList) => (await Promise.allSettled(basePathList.map(async (basePath) => [
|
|
25
28
|
basePath,
|
|
26
29
|
await fetchJSON(joinPath(basePath, SEARCH_INDEX_FILENAME)),
|
|
27
30
|
])))
|
|
28
31
|
.map((_) => (_.status === 'fulfilled' ? _.value : []))
|
|
29
|
-
.map(getSearchIndex);
|
|
30
|
-
const getSearchIndex = ([basePath, result]) => {
|
|
32
|
+
.map(getSearchIndex(router));
|
|
33
|
+
const getSearchIndex = (router) => ([basePath, result]) => {
|
|
31
34
|
if (!result) {
|
|
32
35
|
return {};
|
|
33
36
|
}
|
|
@@ -35,7 +38,7 @@ const getSearchIndex = ([basePath, result]) => {
|
|
|
35
38
|
...result,
|
|
36
39
|
corpus: result.corpus?.map((_) => ({
|
|
37
40
|
..._,
|
|
38
|
-
uri: _.uri === 'index' ? basePath :
|
|
41
|
+
uri: _.uri === 'index' ? basePath : adjustHref(router)(_.uri, basePath),
|
|
39
42
|
})),
|
|
40
43
|
};
|
|
41
44
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSearch.js","sourceRoot":"","sources":["../../../src/services/search/useSearch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AACpF,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAqC,MAAM,UAAU,CAAC;AAErE,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAgBlD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EACxB,YAAY,EACZ,YAAY,GAAG,EAAE,GACJ,EAA2C,EAAE;IAC1D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IAEvD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,IAAI,EAAE;YACvD,QAAQ,CAAC,YAAY,CAAC,CAAC;SACxB;IACH,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,
|
|
1
|
+
{"version":3,"file":"useSearch.js","sourceRoot":"","sources":["../../../src/services/search/useSearch.ts"],"names":[],"mappings":"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"}
|
|
@@ -10447,7 +10447,7 @@
|
|
|
10447
10447
|
slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
|
|
10448
10448
|
});
|
|
10449
10449
|
|
|
10450
|
-
const packageVersion = "0.14.
|
|
10450
|
+
const packageVersion = "0.14.844";
|
|
10451
10451
|
|
|
10452
10452
|
exports.Blocks = Blocks;
|
|
10453
10453
|
exports.ContentPage = ContentPage;
|