@paroicms/server 1.18.0 → 1.19.0

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.
@@ -7,7 +7,7 @@ const liquidjs_1 = require("liquidjs");
7
7
  const rendering_context_1 = require("../../../liquidjs-tools/liquidjs-rendering/rendering-context");
8
8
  const liquidjs_utils_1 = require("../../../liquidjs-tools/liquidjs-utils");
9
9
  const make_image_available_1 = require("../../../public-payload/make-image-available");
10
- const availableParameterNames = new Set(["uid", "handle", "size", "autoCrop"]);
10
+ const availableParameterNames = new Set(["uid", "handle", "size", "autoCrop", "real"]);
11
11
  function createUseImageLiquidJsTag(siteContext) {
12
12
  return class UseImageTag extends liquidjs_1.Tag {
13
13
  #hash;
@@ -26,17 +26,27 @@ function createUseImageLiquidJsTag(siteContext) {
26
26
  ctx.bottom()[this.#varName] = cacheVal.val;
27
27
  return;
28
28
  }
29
- const realSize = (0, server_image_cache_engine_1.applyRatioToVariantName)(options.size, siteContext.themeConf.pixelRatio);
29
+ const realSize = options.real
30
+ ? options.size
31
+ : (0, server_image_cache_engine_1.applyRatioToVariantName)(options.size, siteContext.themeConf.pixelRatio);
30
32
  const image = (yield (0, make_image_available_1.makeImageAvailable)(siteContext, renderingContext, {
31
33
  ...options,
32
34
  size: realSize,
33
35
  }));
34
36
  if (!image)
35
37
  throw new Error("useImage: missing image");
38
+ const imageSize = options.real
39
+ ? {
40
+ width: image.width,
41
+ height: image.height,
42
+ }
43
+ : {
44
+ width: Math.round(image.width / siteContext.themeConf.pixelRatio),
45
+ height: Math.round(image.height / siteContext.themeConf.pixelRatio),
46
+ };
36
47
  const val = {
37
48
  ...image,
38
- width: Math.round(image.width / siteContext.themeConf.pixelRatio),
39
- height: Math.round(image.height / siteContext.themeConf.pixelRatio),
49
+ ...imageSize,
40
50
  };
41
51
  renderingContext.setValueIntoCache(cacheKey, val);
42
52
  ctx.bottom()[this.#varName] = val;
@@ -56,10 +66,11 @@ function validateParameters(values, varName, { siteLog }) {
56
66
  const uid = (0, data_formatters_lib_1.strValOrUndef)(values.uid);
57
67
  const handle = (0, data_formatters_lib_1.strValOrUndef)(values.handle);
58
68
  const autoCrop = (0, data_formatters_lib_1.boolValOrUndef)(values.autoCrop);
69
+ const real = (0, data_formatters_lib_1.boolValOrUndef)(values.real);
59
70
  if (uid)
60
- return { imageSel: { uid }, size, autoCrop };
71
+ return { imageSel: { uid }, size, autoCrop, real };
61
72
  if (handle)
62
- return { imageSel: { handle }, size, autoCrop };
73
+ return { imageSel: { handle }, size, autoCrop, real };
63
74
  throw new Error("useImage: missing 'uid' parameter");
64
75
  }
65
76
  //# sourceMappingURL=use-image-tag.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"use-image-tag.js","sourceRoot":"","sources":["../../../../src/modules/public-site/liquidjs-tags/use-image-tag.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"use-image-tag.js","sourceRoot":"","sources":["../../../../src/modules/public-site/liquidjs-tags/use-image-tag.ts"],"names":[],"mappings":"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"}
@@ -13,6 +13,7 @@ export interface MakeImageAvailableByHandleOptions {
13
13
  };
14
14
  size: VariantName;
15
15
  autoCrop?: boolean;
16
+ real?: boolean;
16
17
  }
17
18
  export interface MakeImageAvailableByUidOptions {
18
19
  imageSel: {
@@ -20,6 +21,7 @@ export interface MakeImageAvailableByUidOptions {
20
21
  };
21
22
  size: VariantName;
22
23
  autoCrop?: boolean;
24
+ real?: boolean;
23
25
  }
24
26
  export declare function makeImageAvailable(siteContext: SiteContext, renderingContext: RenderingContext, options: MakeImageAvailableByHandleOptions): Promise<PublicImage | undefined>;
25
27
  export declare function makeImageAvailable(siteContext: SiteContext, renderingContext: RenderingContext, options: MakeImageAvailableByUidOptions): Promise<PublicImage>;
@@ -1 +1 @@
1
- {"version":3,"file":"make-image-available.js","sourceRoot":"","sources":["../../src/public-payload/make-image-available.ts"],"names":[],"mappings":";;;AACA,mFAAwE;AACxE,wDAA+D;AAsCxD,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,gBAAkC,EAClC,EACE,QAAQ,EACR,IAAI,EACJ,QAAQ,GAAG,KAAK,GACmD;IAErE,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEhE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,QAAQ,IAAI,QAAQ;YAAE,OAAO;QACjC,MAAM,IAAI,KAAK,CAAC,kBAAkB,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACnE,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,UAAU,KAAK,CAAC,GAAG,sBAAsB,CAAC,CAAC;IAEvF,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE,GAC5E,MAAM,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC9C,QAAQ,EAAE;YACR,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B;QACD,WAAW,EAAE,IAAI;QACjB,QAAQ;QACR,gBAAgB,EAAE,gBAAgB,CAAC,QAAQ;QAC3C,IAAI,EAAE,IAAA,6CAAiB,EAAC,KAAK,CAAC,YAAY,CAAC;KAC5C,CAAC,CAAC;IAEL,OAAO;QACL,GAAG,EAAE,IAAA,mCAAqB,EAAC,WAAW,EAAE;YACtC,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,SAAS;YACT,mBAAmB,EAAE,mBAAmB;YACxC,eAAe;YACf,IAAI;SACL,CAAC;QACF,KAAK;QACL,MAAM;QACN,SAAS;KACV,CAAC;AACJ,CAAC;AA3CD,gDA2CC;AAED,SAAS,gBAAgB,CAAC,QAA8C;IACtE,OAAO,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;AAC5D,CAAC"}
1
+ {"version":3,"file":"make-image-available.js","sourceRoot":"","sources":["../../src/public-payload/make-image-available.ts"],"names":[],"mappings":";;;AACA,mFAAwE;AACxE,wDAA+D;AAwCxD,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,gBAAkC,EAClC,EACE,QAAQ,EACR,IAAI,EACJ,QAAQ,GAAG,KAAK,GACmD;IAErE,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEhE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,QAAQ,IAAI,QAAQ;YAAE,OAAO;QACjC,MAAM,IAAI,KAAK,CAAC,kBAAkB,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACnE,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,UAAU,KAAK,CAAC,GAAG,sBAAsB,CAAC,CAAC;IAEvF,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE,GAC5E,MAAM,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC9C,QAAQ,EAAE;YACR,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B;QACD,WAAW,EAAE,IAAI;QACjB,QAAQ;QACR,gBAAgB,EAAE,gBAAgB,CAAC,QAAQ;QAC3C,IAAI,EAAE,IAAA,6CAAiB,EAAC,KAAK,CAAC,YAAY,CAAC;KAC5C,CAAC,CAAC;IAEL,OAAO;QACL,GAAG,EAAE,IAAA,mCAAqB,EAAC,WAAW,EAAE;YACtC,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,SAAS;YACT,mBAAmB,EAAE,mBAAmB;YACxC,eAAe;YACf,IAAI;SACL,CAAC;QACF,KAAK;QACL,MAAM;QACN,SAAS;KACV,CAAC;AACJ,CAAC;AA3CD,gDA2CC;AAED,SAAS,gBAAgB,CAAC,QAA8C;IACtE,OAAO,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;AAC5D,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@paroicms/server",
3
- "version": "1.18.0",
3
+ "version": "1.19.0",
4
4
  "description": "The ParoiCMS server",
5
5
  "keywords": [
6
6
  "cms",