@redneckz/wildless-cms-uni-blocks 0.8.30 → 0.8.31
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/bin/migrateContentUnit.js +2 -5
- package/bin/migration-scripts/0.8.31.js +86 -0
- package/bundle/bundle.umd.js +1 -1
- package/bundle/bundle.umd.min.js +1 -1
- package/bundle/content-page-repository/transformImgPath.d.ts +8 -0
- package/dist/content-page-repository/transformImg.js +6 -6
- package/dist/content-page-repository/transformImg.js.map +1 -1
- package/dist/content-page-repository/transformImgPath.d.ts +8 -0
- package/{mobile/dist/content-page-repository/transformSrc.js → dist/content-page-repository/transformImgPath.js} +7 -5
- package/dist/content-page-repository/transformImgPath.js.map +1 -0
- package/dist/content-page-repository/transformPicture.js +3 -3
- package/dist/content-page-repository/transformPicture.js.map +1 -1
- package/lib/content-page-repository/transformImg.js +6 -6
- package/lib/content-page-repository/transformImg.js.map +1 -1
- package/lib/content-page-repository/transformImgPath.d.ts +8 -0
- package/lib/content-page-repository/{transformSrc.js → transformImgPath.js} +5 -3
- package/lib/content-page-repository/transformImgPath.js.map +1 -0
- package/lib/content-page-repository/transformPicture.js +3 -3
- package/lib/content-page-repository/transformPicture.js.map +1 -1
- package/mobile/bundle/bundle.umd.js +1 -1
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/bundle/content-page-repository/transformImgPath.d.ts +8 -0
- package/mobile/dist/content-page-repository/transformImg.js +6 -6
- package/mobile/dist/content-page-repository/transformImg.js.map +1 -1
- package/mobile/dist/content-page-repository/transformImgPath.d.ts +8 -0
- package/{dist/content-page-repository/transformSrc.js → mobile/dist/content-page-repository/transformImgPath.js} +7 -5
- package/mobile/dist/content-page-repository/transformImgPath.js.map +1 -0
- package/mobile/dist/content-page-repository/transformPicture.js +3 -3
- package/mobile/dist/content-page-repository/transformPicture.js.map +1 -1
- package/mobile/lib/content-page-repository/transformImg.js +6 -6
- package/mobile/lib/content-page-repository/transformImg.js.map +1 -1
- package/mobile/lib/content-page-repository/transformImgPath.d.ts +8 -0
- package/mobile/lib/content-page-repository/{transformSrc.js → transformImgPath.js} +5 -3
- package/mobile/lib/content-page-repository/transformImgPath.js.map +1 -0
- package/mobile/lib/content-page-repository/transformPicture.js +3 -3
- package/mobile/lib/content-page-repository/transformPicture.js.map +1 -1
- package/mobile/src/content-page-repository/transformImg.ts +6 -9
- package/mobile/src/content-page-repository/{transformSrc.ts → transformImgPath.ts} +12 -3
- package/mobile/src/content-page-repository/transformPicture.ts +3 -6
- package/package.json +1 -1
- package/src/content-page-repository/transformImg.ts +6 -9
- package/src/content-page-repository/{transformSrc.ts → transformImgPath.ts} +12 -3
- package/src/content-page-repository/transformPicture.ts +3 -6
- package/bundle/content-page-repository/transformSrc.d.ts +0 -3
- package/dist/content-page-repository/transformSrc.d.ts +0 -3
- package/dist/content-page-repository/transformSrc.js.map +0 -1
- package/lib/content-page-repository/transformSrc.d.ts +0 -3
- package/lib/content-page-repository/transformSrc.js.map +0 -1
- package/mobile/bundle/content-page-repository/transformSrc.d.ts +0 -3
- package/mobile/dist/content-page-repository/transformSrc.d.ts +0 -3
- package/mobile/dist/content-page-repository/transformSrc.js.map +0 -1
- package/mobile/lib/content-page-repository/transformSrc.d.ts +0 -3
- package/mobile/lib/content-page-repository/transformSrc.js.map +0 -1
|
@@ -8,7 +8,7 @@ const path_1 = __importDefault(require("path"));
|
|
|
8
8
|
const sharp_1 = __importDefault(require("sharp"));
|
|
9
9
|
const util_1 = __importDefault(require("util"));
|
|
10
10
|
const isPictureSizeEmpty_1 = require("../utils/isPictureSizeEmpty");
|
|
11
|
-
const
|
|
11
|
+
const transformImgPath_1 = require("./transformImgPath");
|
|
12
12
|
const mkdir = util_1.default.promisify(fs_1.default.mkdir);
|
|
13
13
|
async function transformImg({ pagePath, src, containerSize, transformationOptions, }) {
|
|
14
14
|
if (!src) {
|
|
@@ -32,16 +32,16 @@ async function transformImg({ pagePath, src, containerSize, transformationOption
|
|
|
32
32
|
if (format) {
|
|
33
33
|
chain = chain.toFormat(format, options);
|
|
34
34
|
}
|
|
35
|
-
const
|
|
36
|
-
const
|
|
37
|
-
await mkdir(path_1.default.dirname(
|
|
35
|
+
const transformedImgPath = (0, transformImgPath_1.transformImgPath)(src, { pageDir, contentDir }, transformationOptions);
|
|
36
|
+
const imgPublicPath = path_1.default.join(publicDir, transformedImgPath);
|
|
37
|
+
await mkdir(path_1.default.dirname(imgPublicPath), { recursive: true });
|
|
38
38
|
try {
|
|
39
|
-
await chain.toFile(
|
|
39
|
+
await chain.toFile(imgPublicPath);
|
|
40
40
|
}
|
|
41
41
|
catch (e) {
|
|
42
42
|
console.error(e);
|
|
43
43
|
}
|
|
44
|
-
return
|
|
44
|
+
return transformedImgPath;
|
|
45
45
|
}
|
|
46
46
|
exports.transformImg = transformImg;
|
|
47
47
|
function createBackgroundImageChain({ width, height }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformImg.js","sourceRoot":"","sources":["../../src/content-page-repository/transformImg.ts"],"names":[],"mappings":";;;;;AAAA,4CAAoB;AACpB,gDAAwB;AAExB,kDAA0B;AAC1B,gDAAwB;AAGxB,oEAAiE;AAEjE,
|
|
1
|
+
{"version":3,"file":"transformImg.js","sourceRoot":"","sources":["../../src/content-page-repository/transformImg.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { ImgSource } from '../model/Picture';
|
|
2
|
+
import type { TransformationOptions } from './TransformationOptions';
|
|
3
|
+
interface DirectoryParams {
|
|
4
|
+
pageDir: string;
|
|
5
|
+
contentDir: string;
|
|
6
|
+
}
|
|
7
|
+
export declare function transformImgPath(src: string, { pageDir, contentDir }: DirectoryParams, { format, size }: TransformationOptions & ImgSource): string;
|
|
8
|
+
export {};
|
|
@@ -2,19 +2,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
2
2
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
3
3
|
};
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.
|
|
5
|
+
exports.transformImgPath = void 0;
|
|
6
6
|
const path_1 = __importDefault(require("path"));
|
|
7
7
|
const isPictureSizeEmpty_1 = require("../utils/isPictureSizeEmpty");
|
|
8
|
-
function
|
|
8
|
+
function transformImgPath(src, { pageDir, contentDir }, { format, size }) {
|
|
9
9
|
const noTransform = (0, isPictureSizeEmpty_1.isPictureSizeEmpty)(size) && !format;
|
|
10
10
|
if (noTransform) {
|
|
11
11
|
return src;
|
|
12
12
|
}
|
|
13
|
+
const imgPath = path_1.default.relative(contentDir, path_1.default.join(pageDir, src));
|
|
14
|
+
const imgDir = path_1.default.dirname(imgPath);
|
|
13
15
|
const fileName = path_1.default.basename(src, path_1.default.extname(src));
|
|
14
16
|
const fileSizes = [size?.width, size?.height].filter(Boolean);
|
|
15
17
|
const suffix = fileSizes.length ? `-${fileSizes.join('-')}` : '';
|
|
16
18
|
const ext = format ? String(format) : 'webp';
|
|
17
|
-
return `${fileName}${suffix}.${ext}
|
|
19
|
+
return path_1.default.join(imgDir, `${fileName}${suffix}.${ext}`);
|
|
18
20
|
}
|
|
19
|
-
exports.
|
|
20
|
-
//# sourceMappingURL=
|
|
21
|
+
exports.transformImgPath = transformImgPath;
|
|
22
|
+
//# sourceMappingURL=transformImgPath.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transformImgPath.js","sourceRoot":"","sources":["../../src/content-page-repository/transformImgPath.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AAExB,oEAAiE;AAQjE,SAAgB,gBAAgB,CAC9B,GAAW,EACX,EAAE,OAAO,EAAE,UAAU,EAAmB,EACxC,EAAE,MAAM,EAAE,IAAI,EAAqC;IAEnD,MAAM,WAAW,GAAG,IAAA,uCAAkB,EAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IACxD,IAAI,WAAW,EAAE;QACf,OAAO,GAAG,CAAC;KACZ;IAED,MAAM,OAAO,GAAG,cAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAErC,MAAM,QAAQ,GAAG,cAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAE7C,OAAO,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,QAAQ,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC;AAC1D,CAAC;AAnBD,4CAmBC"}
|
|
@@ -14,7 +14,7 @@ async function transformPicture(pagePath, picture, options) {
|
|
|
14
14
|
src,
|
|
15
15
|
transformationOptions: { ...options, ...picture },
|
|
16
16
|
});
|
|
17
|
-
const { width, height } = await (0, sharp_1.default)(path_1.default.resolve(options.publicDir,
|
|
17
|
+
const { width, height } = await (0, sharp_1.default)(path_1.default.resolve(options.publicDir, transformedPicture)).metadata();
|
|
18
18
|
const containerSize = width && height ? { width, height } : undefined;
|
|
19
19
|
const transformedSources = await Promise.all(sources.map((_) => (0, transformImg_1.transformImg)({
|
|
20
20
|
pagePath,
|
|
@@ -24,10 +24,10 @@ async function transformPicture(pagePath, picture, options) {
|
|
|
24
24
|
})));
|
|
25
25
|
return {
|
|
26
26
|
...picture,
|
|
27
|
-
src: transformedPicture,
|
|
27
|
+
src: path_1.default.join('/', transformedPicture),
|
|
28
28
|
sources: transformedSources.map((_, i) => ({
|
|
29
29
|
...sources[i],
|
|
30
|
-
src: _,
|
|
30
|
+
src: path_1.default.join('/', _),
|
|
31
31
|
size: { width, height },
|
|
32
32
|
})),
|
|
33
33
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformPicture.js","sourceRoot":"","sources":["../../src/content-page-repository/transformPicture.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AACxB,kDAA0B;AAG1B,iDAA8C;AAEvC,KAAK,UAAU,gBAAgB,CACpC,QAAgB,EAChB,OAAgB,EAChB,OAA8B;IAE9B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;IAE/B,MAAM,kBAAkB,GAAG,MAAM,IAAA,2BAAY,EAAC;QAC5C,QAAQ;QACR,GAAG;QACH,qBAAqB,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE;KAClD,CAAC,CAAC;IAEH,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,eAAK,EACnC,cAAI,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"transformPicture.js","sourceRoot":"","sources":["../../src/content-page-repository/transformPicture.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AACxB,kDAA0B;AAG1B,iDAA8C;AAEvC,KAAK,UAAU,gBAAgB,CACpC,QAAgB,EAChB,OAAgB,EAChB,OAA8B;IAE9B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;IAE/B,MAAM,kBAAkB,GAAG,MAAM,IAAA,2BAAY,EAAC;QAC5C,QAAQ;QACR,GAAG;QACH,qBAAqB,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE;KAClD,CAAC,CAAC;IAEH,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,eAAK,EACnC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,kBAAkB,CAAC,CACpD,CAAC,QAAQ,EAAE,CAAC;IAEb,MAAM,aAAa,GAAG,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAEtE,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC1C,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAChB,IAAA,2BAAY,EAAC;QACX,QAAQ;QACR,GAAG;QACH,aAAa;QACb,qBAAqB,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,CAAC,EAAE;KAC5C,CAAC,CACH,CACF,CAAC;IAEF,OAAO;QACL,GAAG,OAAO;QACV,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,kBAAkB,CAAC;QACvC,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACzC,GAAG,OAAO,CAAC,CAAC,CAAC;YACb,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YACtB,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;SACxB,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC;AAxCD,4CAwCC"}
|
|
@@ -3,7 +3,7 @@ import path from 'path';
|
|
|
3
3
|
import sharp from 'sharp';
|
|
4
4
|
import util from 'util';
|
|
5
5
|
import { isPictureSizeEmpty } from '../utils/isPictureSizeEmpty.js';
|
|
6
|
-
import {
|
|
6
|
+
import { transformImgPath } from './transformImgPath.js';
|
|
7
7
|
const mkdir = util.promisify(fs.mkdir);
|
|
8
8
|
export async function transformImg({ pagePath, src, containerSize, transformationOptions, }) {
|
|
9
9
|
if (!src) {
|
|
@@ -27,16 +27,16 @@ export async function transformImg({ pagePath, src, containerSize, transformatio
|
|
|
27
27
|
if (format) {
|
|
28
28
|
chain = chain.toFormat(format, options);
|
|
29
29
|
}
|
|
30
|
-
const
|
|
31
|
-
const
|
|
32
|
-
await mkdir(path.dirname(
|
|
30
|
+
const transformedImgPath = transformImgPath(src, { pageDir, contentDir }, transformationOptions);
|
|
31
|
+
const imgPublicPath = path.join(publicDir, transformedImgPath);
|
|
32
|
+
await mkdir(path.dirname(imgPublicPath), { recursive: true });
|
|
33
33
|
try {
|
|
34
|
-
await chain.toFile(
|
|
34
|
+
await chain.toFile(imgPublicPath);
|
|
35
35
|
}
|
|
36
36
|
catch (e) {
|
|
37
37
|
console.error(e);
|
|
38
38
|
}
|
|
39
|
-
return
|
|
39
|
+
return transformedImgPath;
|
|
40
40
|
}
|
|
41
41
|
function createBackgroundImageChain({ width, height }) {
|
|
42
42
|
const channels = 4;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformImg.js","sourceRoot":"","sources":["../../src/content-page-repository/transformImg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"transformImg.js","sourceRoot":"","sources":["../../src/content-page-repository/transformImg.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { ImgSource } from '../model/Picture';
|
|
2
|
+
import type { TransformationOptions } from './TransformationOptions';
|
|
3
|
+
interface DirectoryParams {
|
|
4
|
+
pageDir: string;
|
|
5
|
+
contentDir: string;
|
|
6
|
+
}
|
|
7
|
+
export declare function transformImgPath(src: string, { pageDir, contentDir }: DirectoryParams, { format, size }: TransformationOptions & ImgSource): string;
|
|
8
|
+
export {};
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
2
|
import { isPictureSizeEmpty } from '../utils/isPictureSizeEmpty.js';
|
|
3
|
-
export function
|
|
3
|
+
export function transformImgPath(src, { pageDir, contentDir }, { format, size }) {
|
|
4
4
|
const noTransform = isPictureSizeEmpty(size) && !format;
|
|
5
5
|
if (noTransform) {
|
|
6
6
|
return src;
|
|
7
7
|
}
|
|
8
|
+
const imgPath = path.relative(contentDir, path.join(pageDir, src));
|
|
9
|
+
const imgDir = path.dirname(imgPath);
|
|
8
10
|
const fileName = path.basename(src, path.extname(src));
|
|
9
11
|
const fileSizes = [size?.width, size?.height].filter(Boolean);
|
|
10
12
|
const suffix = fileSizes.length ? `-${fileSizes.join('-')}` : '';
|
|
11
13
|
const ext = format ? String(format) : 'webp';
|
|
12
|
-
return `${fileName}${suffix}.${ext}
|
|
14
|
+
return path.join(imgDir, `${fileName}${suffix}.${ext}`);
|
|
13
15
|
}
|
|
14
|
-
//# sourceMappingURL=
|
|
16
|
+
//# sourceMappingURL=transformImgPath.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transformImgPath.js","sourceRoot":"","sources":["../../src/content-page-repository/transformImgPath.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAQjE,MAAM,UAAU,gBAAgB,CAC9B,GAAW,EACX,EAAE,OAAO,EAAE,UAAU,EAAmB,EACxC,EAAE,MAAM,EAAE,IAAI,EAAqC;IAEnD,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IACxD,IAAI,WAAW,EAAE;QACf,OAAO,GAAG,CAAC;KACZ;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAErC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAE7C,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,QAAQ,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC;AAC1D,CAAC"}
|
|
@@ -9,7 +9,7 @@ export async function transformPicture(pagePath, picture, options) {
|
|
|
9
9
|
src,
|
|
10
10
|
transformationOptions: { ...options, ...picture },
|
|
11
11
|
});
|
|
12
|
-
const { width, height } = await sharp(path.resolve(options.publicDir,
|
|
12
|
+
const { width, height } = await sharp(path.resolve(options.publicDir, transformedPicture)).metadata();
|
|
13
13
|
const containerSize = width && height ? { width, height } : undefined;
|
|
14
14
|
const transformedSources = await Promise.all(sources.map((_) => transformImg({
|
|
15
15
|
pagePath,
|
|
@@ -19,10 +19,10 @@ export async function transformPicture(pagePath, picture, options) {
|
|
|
19
19
|
})));
|
|
20
20
|
return {
|
|
21
21
|
...picture,
|
|
22
|
-
src: transformedPicture,
|
|
22
|
+
src: path.join('/', transformedPicture),
|
|
23
23
|
sources: transformedSources.map((_, i) => ({
|
|
24
24
|
...sources[i],
|
|
25
|
-
src: _,
|
|
25
|
+
src: path.join('/', _),
|
|
26
26
|
size: { width, height },
|
|
27
27
|
})),
|
|
28
28
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformPicture.js","sourceRoot":"","sources":["../../src/content-page-repository/transformPicture.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,QAAgB,EAChB,OAAgB,EAChB,OAA8B;IAE9B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;IAE/B,MAAM,kBAAkB,GAAG,MAAM,YAAY,CAAC;QAC5C,QAAQ;QACR,GAAG;QACH,qBAAqB,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE;KAClD,CAAC,CAAC;IAEH,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CACnC,IAAI,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"transformPicture.js","sourceRoot":"","sources":["../../src/content-page-repository/transformPicture.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,QAAgB,EAChB,OAAgB,EAChB,OAA8B;IAE9B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;IAE/B,MAAM,kBAAkB,GAAG,MAAM,YAAY,CAAC;QAC5C,QAAQ;QACR,GAAG;QACH,qBAAqB,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE;KAClD,CAAC,CAAC;IAEH,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CACnC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,kBAAkB,CAAC,CACpD,CAAC,QAAQ,EAAE,CAAC;IAEb,MAAM,aAAa,GAAG,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAEtE,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC1C,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAChB,YAAY,CAAC;QACX,QAAQ;QACR,GAAG;QACH,aAAa;QACb,qBAAqB,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,CAAC,EAAE;KAC5C,CAAC,CACH,CACF,CAAC;IAEF,OAAO;QACL,GAAG,OAAO;QACV,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,kBAAkB,CAAC;QACvC,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACzC,GAAG,OAAO,CAAC,CAAC,CAAC;YACb,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YACtB,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;SACxB,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC"}
|
|
@@ -7,7 +7,7 @@ import type { ImageSize } from '../model/ImageSize';
|
|
|
7
7
|
import type { ImgAlignment, ImgSource, Picture } from '../model/Picture';
|
|
8
8
|
import { isPictureSizeEmpty } from '../utils/isPictureSizeEmpty';
|
|
9
9
|
import type { TransformationOptions } from './TransformationOptions';
|
|
10
|
-
import {
|
|
10
|
+
import { transformImgPath } from './transformImgPath';
|
|
11
11
|
|
|
12
12
|
const mkdir = util.promisify(fs.mkdir);
|
|
13
13
|
|
|
@@ -59,21 +59,18 @@ export async function transformImg({
|
|
|
59
59
|
chain = chain.toFormat(format, options);
|
|
60
60
|
}
|
|
61
61
|
|
|
62
|
-
const
|
|
63
|
-
const
|
|
64
|
-
contentDir,
|
|
65
|
-
`${path.dirname(pagePath)}/${transformedSrc}`,
|
|
66
|
-
)}`;
|
|
62
|
+
const transformedImgPath = transformImgPath(src, { pageDir, contentDir }, transformationOptions);
|
|
63
|
+
const imgPublicPath = path.join(publicDir, transformedImgPath);
|
|
67
64
|
|
|
68
|
-
await mkdir(path.dirname(
|
|
65
|
+
await mkdir(path.dirname(imgPublicPath), { recursive: true });
|
|
69
66
|
|
|
70
67
|
try {
|
|
71
|
-
await chain.toFile(
|
|
68
|
+
await chain.toFile(imgPublicPath);
|
|
72
69
|
} catch (e) {
|
|
73
70
|
console.error(e);
|
|
74
71
|
}
|
|
75
72
|
|
|
76
|
-
return
|
|
73
|
+
return transformedImgPath;
|
|
77
74
|
}
|
|
78
75
|
|
|
79
76
|
function createBackgroundImageChain({ width, height }: ImageSize) {
|
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
2
|
import type { ImgSource } from '../model/Picture';
|
|
3
|
-
import type { TransformationOptions } from './TransformationOptions';
|
|
4
3
|
import { isPictureSizeEmpty } from '../utils/isPictureSizeEmpty';
|
|
4
|
+
import type { TransformationOptions } from './TransformationOptions';
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
interface DirectoryParams {
|
|
7
|
+
pageDir: string;
|
|
8
|
+
contentDir: string;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
export function transformImgPath(
|
|
7
12
|
src: string,
|
|
13
|
+
{ pageDir, contentDir }: DirectoryParams,
|
|
8
14
|
{ format, size }: TransformationOptions & ImgSource,
|
|
9
15
|
): string {
|
|
10
16
|
const noTransform = isPictureSizeEmpty(size) && !format;
|
|
@@ -12,10 +18,13 @@ export function transformSrc(
|
|
|
12
18
|
return src;
|
|
13
19
|
}
|
|
14
20
|
|
|
21
|
+
const imgPath = path.relative(contentDir, path.join(pageDir, src));
|
|
22
|
+
const imgDir = path.dirname(imgPath);
|
|
23
|
+
|
|
15
24
|
const fileName = path.basename(src, path.extname(src));
|
|
16
25
|
const fileSizes = [size?.width, size?.height].filter(Boolean);
|
|
17
26
|
const suffix = fileSizes.length ? `-${fileSizes.join('-')}` : '';
|
|
18
27
|
const ext = format ? String(format) : 'webp';
|
|
19
28
|
|
|
20
|
-
return `${fileName}${suffix}.${ext}
|
|
29
|
+
return path.join(imgDir, `${fileName}${suffix}.${ext}`);
|
|
21
30
|
}
|
|
@@ -19,10 +19,7 @@ export async function transformPicture(
|
|
|
19
19
|
});
|
|
20
20
|
|
|
21
21
|
const { width, height } = await sharp(
|
|
22
|
-
path.resolve(
|
|
23
|
-
options.publicDir,
|
|
24
|
-
path.relative(options.contentDir, `${path.dirname(pagePath)}/${transformedPicture}`),
|
|
25
|
-
),
|
|
22
|
+
path.resolve(options.publicDir, transformedPicture),
|
|
26
23
|
).metadata();
|
|
27
24
|
|
|
28
25
|
const containerSize = width && height ? { width, height } : undefined;
|
|
@@ -40,10 +37,10 @@ export async function transformPicture(
|
|
|
40
37
|
|
|
41
38
|
return {
|
|
42
39
|
...picture,
|
|
43
|
-
src: transformedPicture,
|
|
40
|
+
src: path.join('/', transformedPicture),
|
|
44
41
|
sources: transformedSources.map((_, i) => ({
|
|
45
42
|
...sources[i],
|
|
46
|
-
src: _,
|
|
43
|
+
src: path.join('/', _),
|
|
47
44
|
size: { width, height },
|
|
48
45
|
})),
|
|
49
46
|
};
|
package/package.json
CHANGED
|
@@ -7,7 +7,7 @@ import type { ImageSize } from '../model/ImageSize';
|
|
|
7
7
|
import type { ImgAlignment, ImgSource, Picture } from '../model/Picture';
|
|
8
8
|
import { isPictureSizeEmpty } from '../utils/isPictureSizeEmpty';
|
|
9
9
|
import type { TransformationOptions } from './TransformationOptions';
|
|
10
|
-
import {
|
|
10
|
+
import { transformImgPath } from './transformImgPath';
|
|
11
11
|
|
|
12
12
|
const mkdir = util.promisify(fs.mkdir);
|
|
13
13
|
|
|
@@ -59,21 +59,18 @@ export async function transformImg({
|
|
|
59
59
|
chain = chain.toFormat(format, options);
|
|
60
60
|
}
|
|
61
61
|
|
|
62
|
-
const
|
|
63
|
-
const
|
|
64
|
-
contentDir,
|
|
65
|
-
`${path.dirname(pagePath)}/${transformedSrc}`,
|
|
66
|
-
)}`;
|
|
62
|
+
const transformedImgPath = transformImgPath(src, { pageDir, contentDir }, transformationOptions);
|
|
63
|
+
const imgPublicPath = path.join(publicDir, transformedImgPath);
|
|
67
64
|
|
|
68
|
-
await mkdir(path.dirname(
|
|
65
|
+
await mkdir(path.dirname(imgPublicPath), { recursive: true });
|
|
69
66
|
|
|
70
67
|
try {
|
|
71
|
-
await chain.toFile(
|
|
68
|
+
await chain.toFile(imgPublicPath);
|
|
72
69
|
} catch (e) {
|
|
73
70
|
console.error(e);
|
|
74
71
|
}
|
|
75
72
|
|
|
76
|
-
return
|
|
73
|
+
return transformedImgPath;
|
|
77
74
|
}
|
|
78
75
|
|
|
79
76
|
function createBackgroundImageChain({ width, height }: ImageSize) {
|
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
2
|
import type { ImgSource } from '../model/Picture';
|
|
3
|
-
import type { TransformationOptions } from './TransformationOptions';
|
|
4
3
|
import { isPictureSizeEmpty } from '../utils/isPictureSizeEmpty';
|
|
4
|
+
import type { TransformationOptions } from './TransformationOptions';
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
interface DirectoryParams {
|
|
7
|
+
pageDir: string;
|
|
8
|
+
contentDir: string;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
export function transformImgPath(
|
|
7
12
|
src: string,
|
|
13
|
+
{ pageDir, contentDir }: DirectoryParams,
|
|
8
14
|
{ format, size }: TransformationOptions & ImgSource,
|
|
9
15
|
): string {
|
|
10
16
|
const noTransform = isPictureSizeEmpty(size) && !format;
|
|
@@ -12,10 +18,13 @@ export function transformSrc(
|
|
|
12
18
|
return src;
|
|
13
19
|
}
|
|
14
20
|
|
|
21
|
+
const imgPath = path.relative(contentDir, path.join(pageDir, src));
|
|
22
|
+
const imgDir = path.dirname(imgPath);
|
|
23
|
+
|
|
15
24
|
const fileName = path.basename(src, path.extname(src));
|
|
16
25
|
const fileSizes = [size?.width, size?.height].filter(Boolean);
|
|
17
26
|
const suffix = fileSizes.length ? `-${fileSizes.join('-')}` : '';
|
|
18
27
|
const ext = format ? String(format) : 'webp';
|
|
19
28
|
|
|
20
|
-
return `${fileName}${suffix}.${ext}
|
|
29
|
+
return path.join(imgDir, `${fileName}${suffix}.${ext}`);
|
|
21
30
|
}
|
|
@@ -19,10 +19,7 @@ export async function transformPicture(
|
|
|
19
19
|
});
|
|
20
20
|
|
|
21
21
|
const { width, height } = await sharp(
|
|
22
|
-
path.resolve(
|
|
23
|
-
options.publicDir,
|
|
24
|
-
path.relative(options.contentDir, `${path.dirname(pagePath)}/${transformedPicture}`),
|
|
25
|
-
),
|
|
22
|
+
path.resolve(options.publicDir, transformedPicture),
|
|
26
23
|
).metadata();
|
|
27
24
|
|
|
28
25
|
const containerSize = width && height ? { width, height } : undefined;
|
|
@@ -40,10 +37,10 @@ export async function transformPicture(
|
|
|
40
37
|
|
|
41
38
|
return {
|
|
42
39
|
...picture,
|
|
43
|
-
src: transformedPicture,
|
|
40
|
+
src: path.join('/', transformedPicture),
|
|
44
41
|
sources: transformedSources.map((_, i) => ({
|
|
45
42
|
...sources[i],
|
|
46
|
-
src: _,
|
|
43
|
+
src: path.join('/', _),
|
|
47
44
|
size: { width, height },
|
|
48
45
|
})),
|
|
49
46
|
};
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"transformSrc.js","sourceRoot":"","sources":["../../src/content-page-repository/transformSrc.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AAGxB,oEAAiE;AAEjE,SAAgB,YAAY,CAC1B,GAAW,EACX,EAAE,MAAM,EAAE,IAAI,EAAqC;IAEnD,MAAM,WAAW,GAAG,IAAA,uCAAkB,EAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IACxD,IAAI,WAAW,EAAE;QACf,OAAO,GAAG,CAAC;KACZ;IAED,MAAM,QAAQ,GAAG,cAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAE7C,OAAO,GAAG,QAAQ,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC;AACvC,CAAC;AAfD,oCAeC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"transformSrc.js","sourceRoot":"","sources":["../../src/content-page-repository/transformSrc.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE,MAAM,UAAU,YAAY,CAC1B,GAAW,EACX,EAAE,MAAM,EAAE,IAAI,EAAqC;IAEnD,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IACxD,IAAI,WAAW,EAAE;QACf,OAAO,GAAG,CAAC;KACZ;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAE7C,OAAO,GAAG,QAAQ,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC;AACvC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"transformSrc.js","sourceRoot":"","sources":["../../src/content-page-repository/transformSrc.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AAGxB,oEAAiE;AAEjE,SAAgB,YAAY,CAC1B,GAAW,EACX,EAAE,MAAM,EAAE,IAAI,EAAqC;IAEnD,MAAM,WAAW,GAAG,IAAA,uCAAkB,EAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IACxD,IAAI,WAAW,EAAE;QACf,OAAO,GAAG,CAAC;KACZ;IAED,MAAM,QAAQ,GAAG,cAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,cAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAE7C,OAAO,GAAG,QAAQ,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC;AACvC,CAAC;AAfD,oCAeC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"transformSrc.js","sourceRoot":"","sources":["../../src/content-page-repository/transformSrc.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE,MAAM,UAAU,YAAY,CAC1B,GAAW,EACX,EAAE,MAAM,EAAE,IAAI,EAAqC;IAEnD,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IACxD,IAAI,WAAW,EAAE;QACf,OAAO,GAAG,CAAC;KACZ;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAE7C,OAAO,GAAG,QAAQ,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC;AACvC,CAAC"}
|