@paroicms/server 1.31.4 → 1.31.5

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.
@@ -3,5 +3,8 @@ export declare function escapeHtml(text: string, options?: {
3
3
  }): string;
4
4
  export declare function newLinesToBr(text: string): string;
5
5
  export declare function htmlToText(html: string): string;
6
- export declare function stripHtmlTags(html: string): string;
6
+ export declare function stripHtmlTags(html: string, { blockSeparator }?: {
7
+ blockSeparator?: string;
8
+ }): string;
9
+ export declare function insertBlockSeparators(html: string, sep: string): string;
7
10
  export declare function replaceLinks(html: string): string;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.replaceLinks = exports.stripHtmlTags = exports.htmlToText = exports.newLinesToBr = exports.escapeHtml = void 0;
3
+ exports.replaceLinks = exports.insertBlockSeparators = exports.stripHtmlTags = exports.htmlToText = exports.newLinesToBr = exports.escapeHtml = void 0;
4
4
  const htmlEntities = {
5
5
  "&": "&",
6
6
  "<": "&lt;",
@@ -27,16 +27,21 @@ function htmlToText(html) {
27
27
  exports.htmlToText = htmlToText;
28
28
  const tagBody = "(?:[^\"'>]|\"[^\"]*\"|'[^']*')*";
29
29
  const tagOrComment = new RegExp(`<(?:!--(?:(?:-*[^->])*--+|-?)|script\\b${tagBody}>[\\s\\S]*?</script\\s*|style\\b${tagBody}>[\\s\\S]*?</style\\s*|/?[a-z]${tagBody})>`, "gi");
30
- function stripHtmlTags(html) {
31
- let val = html;
32
- let oldHtml;
30
+ function stripHtmlTags(html, { blockSeparator } = {}) {
31
+ let val = blockSeparator ? insertBlockSeparators(html, blockSeparator) : html;
32
+ let prev;
33
33
  do {
34
- oldHtml = val;
34
+ prev = val;
35
35
  val = val.replace(tagOrComment, "");
36
- } while (val !== oldHtml);
37
- return val.replace(/</g, "&lt;");
36
+ } while (val !== prev);
37
+ return val.replace(/\s\s+/g, " ");
38
38
  }
39
39
  exports.stripHtmlTags = stripHtmlTags;
40
+ function insertBlockSeparators(html, sep) {
41
+ const regex = /(\w)(<\/(?:address|article|aside|blockquote|canvas|dd|div|dl|dt|fieldset|figcaption|figure|footer|form|h[1-6]|header|hr|li|main|nav|noscript|ol|p|pre|section|table|tfoot|ul|video)>)/g;
42
+ return html.replace(regex, (_, p1, p2) => `${p1}${sep}${p2}`);
43
+ }
44
+ exports.insertBlockSeparators = insertBlockSeparators;
40
45
  function replaceLinks(html) {
41
46
  return html.replace(/<a\s+[^>]*href="([^"]*)"[^>]*>([\s\S]*)<\/a>/gi, (_, url, label) => {
42
47
  return `${label.trim()} ( ${url} )`;
@@ -1 +1 @@
1
- {"version":3,"file":"html-helpers.js","sourceRoot":"","sources":["../../../src/common/mail/html-helpers.ts"],"names":[],"mappings":";;;AAMA,MAAM,YAAY,GAAG;IACnB,GAAG,EAAE,OAAO;IACZ,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,QAAQ;IACb,GAAG,EAAE,QAAQ;CACd,CAAC;AAEF,SAAgB,UAAU,CAAC,IAAY,EAAE,UAAsC,EAAE;IAC/E,IAAI,GAAG,GAAG,IAAI,CAAC;IACf,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAA8B,CAAC,CAAC,CAAC;IACnF,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACzB,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAPD,gCAOC;AAED,SAAgB,YAAY,CAAC,IAAY;IACvC,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AACnD,CAAC;AAFD,oCAEC;AAED,SAAgB,UAAU,CAAC,IAAY;IACrC,OAAO,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;AAC3C,CAAC;AAFD,gCAEC;AAKD,MAAM,OAAO,GAAG,iCAAiC,CAAC;AAClD,MAAM,YAAY,GAAG,IAAI,MAAM,CAC7B,0CAA0C,OAAO,mCAAmC,OAAO,iCAAiC,OAAO,IAAI,EACvI,IAAI,CACL,CAAC;AAEF,SAAgB,aAAa,CAAC,IAAY;IACxC,IAAI,GAAG,GAAG,IAAI,CAAC;IACf,IAAI,OAAe,CAAC;IACpB,GAAG,CAAC;QACF,OAAO,GAAG,GAAG,CAAC;QACd,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IACtC,CAAC,QAAQ,GAAG,KAAK,OAAO,EAAE;IAC1B,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACnC,CAAC;AARD,sCAQC;AAED,SAAgB,YAAY,CAAC,IAAY;IACvC,OAAO,IAAI,CAAC,OAAO,CAAC,gDAAgD,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;QACtF,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,CAAC,CAAC,CAAC;AACL,CAAC;AAJD,oCAIC"}
1
+ {"version":3,"file":"html-helpers.js","sourceRoot":"","sources":["../../../src/common/mail/html-helpers.ts"],"names":[],"mappings":";;;AAMA,MAAM,YAAY,GAAG;IACnB,GAAG,EAAE,OAAO;IACZ,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,QAAQ;IACb,GAAG,EAAE,QAAQ;CACd,CAAC;AAEF,SAAgB,UAAU,CAAC,IAAY,EAAE,UAAsC,EAAE;IAC/E,IAAI,GAAG,GAAG,IAAI,CAAC;IACf,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAA8B,CAAC,CAAC,CAAC;IACnF,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACzB,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAPD,gCAOC;AAED,SAAgB,YAAY,CAAC,IAAY;IACvC,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AACnD,CAAC;AAFD,oCAEC;AAED,SAAgB,UAAU,CAAC,IAAY;IACrC,OAAO,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;AAC3C,CAAC;AAFD,gCAEC;AAKD,MAAM,OAAO,GAAG,iCAAiC,CAAC;AAClD,MAAM,YAAY,GAAG,IAAI,MAAM,CAC7B,0CAA0C,OAAO,mCAAmC,OAAO,iCAAiC,OAAO,IAAI,EACvI,IAAI,CACL,CAAC;AAEF,SAAgB,aAAa,CAAC,IAAY,EAAE,EAAE,cAAc,KAAkC,EAAE;IAC9F,IAAI,GAAG,GAAG,cAAc,CAAC,CAAC,CAAC,qBAAqB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9E,IAAI,IAAY,CAAC;IACjB,GAAG,CAAC;QACF,IAAI,GAAG,GAAG,CAAC;QACX,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IACtC,CAAC,QAAQ,GAAG,KAAK,IAAI,EAAE;IACvB,OAAO,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AACpC,CAAC;AARD,sCAQC;AAED,SAAgB,qBAAqB,CAAC,IAAY,EAAE,GAAW;IAC7D,MAAM,KAAK,GACT,wLAAwL,CAAC;IAC3L,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC;AAChE,CAAC;AAJD,sDAIC;AAED,SAAgB,YAAY,CAAC,IAAY;IACvC,OAAO,IAAI,CAAC,OAAO,CAAC,gDAAgD,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;QACtF,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,CAAC,CAAC,CAAC;AACL,CAAC;AAJD,oCAIC"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,35 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const vitest_1 = require("vitest");
4
+ const html_helpers_1 = require("./html-helpers");
5
+ (0, vitest_1.describe)("escapeHtml", () => {
6
+ (0, vitest_1.it)("should escape HTML entities", () => {
7
+ (0, vitest_1.expect)((0, html_helpers_1.escapeHtml)("&lt;script&gt;alert('XSS')&lt;/script&gt;")).toBe("&amp;lt;script&amp;gt;alert(&#039;XSS&#039;)&amp;lt;/script&amp;gt;");
8
+ (0, vitest_1.expect)((0, html_helpers_1.escapeHtml)("<div>Hello, world!</div>")).toBe("&lt;div&gt;Hello, world!&lt;/div&gt;");
9
+ });
10
+ (0, vitest_1.it)("should convert new lines to <br> tags if specified", () => {
11
+ (0, vitest_1.expect)((0, html_helpers_1.escapeHtml)("Hello\nWorld", { newLinesToBr: true })).toBe("Hello<br>\nWorld");
12
+ (0, vitest_1.expect)((0, html_helpers_1.escapeHtml)("Hello\r\nWorld", { newLinesToBr: true })).toBe("Hello<br>\nWorld");
13
+ });
14
+ });
15
+ (0, vitest_1.describe)("newLinesToBr", () => {
16
+ (0, vitest_1.it)("should replace new lines with <br> tags", () => {
17
+ (0, vitest_1.expect)((0, html_helpers_1.newLinesToBr)("Hello\nWorld")).toBe("Hello<br>\nWorld");
18
+ (0, vitest_1.expect)((0, html_helpers_1.newLinesToBr)("Hello\r\nWorld")).toBe("Hello<br>\nWorld");
19
+ });
20
+ });
21
+ (0, vitest_1.describe)("stripHtmlTags", () => {
22
+ (0, vitest_1.it)("should remove HTML tags", () => {
23
+ (0, vitest_1.expect)((0, html_helpers_1.stripHtmlTags)("<p>Hello, <strong>World</strong>!</p>")).toBe("Hello, World!");
24
+ (0, vitest_1.expect)((0, html_helpers_1.stripHtmlTags)("<h1>Title</h1><p>Content</p>")).toBe("TitleContent");
25
+ });
26
+ (0, vitest_1.it)("should insert block separators if specified", () => {
27
+ (0, vitest_1.expect)((0, html_helpers_1.stripHtmlTags)("<p>Paragraph 1</p><p>Paragraph 2</p>", { blockSeparator: "#" })).toBe("Paragraph 1#Paragraph 2#");
28
+ });
29
+ });
30
+ (0, vitest_1.describe)("insertBlockSeparators", () => {
31
+ (0, vitest_1.it)("should insert block separators between specified HTML tags", () => {
32
+ (0, vitest_1.expect)((0, html_helpers_1.insertBlockSeparators)("<p>Paragraph 1</p><div>Block 1</div><p>Paragraph 2</p><div>Block 2</div>", "#")).toBe("<p>Paragraph 1#</p><div>Block 1#</div><p>Paragraph 2#</p><div>Block 2#</div>");
33
+ });
34
+ });
35
+ //# sourceMappingURL=html-helpers.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"html-helpers.test.js","sourceRoot":"","sources":["../../../src/common/mail/html-helpers.test.ts"],"names":[],"mappings":";;AAAA,mCAA8C;AAC9C,iDAAgG;AAEhG,IAAA,iBAAQ,EAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,IAAA,WAAE,EAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,IAAA,eAAM,EAAC,IAAA,yBAAU,EAAC,2CAA2C,CAAC,CAAC,CAAC,IAAI,CAClE,qEAAqE,CACtE,CAAC;QACF,IAAA,eAAM,EAAC,IAAA,yBAAU,EAAC,0BAA0B,CAAC,CAAC,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;IAC9F,CAAC,CAAC,CAAC;IAEH,IAAA,WAAE,EAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,IAAA,eAAM,EAAC,IAAA,yBAAU,EAAC,cAAc,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACpF,IAAA,eAAM,EAAC,IAAA,yBAAU,EAAC,gBAAgB,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACxF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAA,iBAAQ,EAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,IAAA,WAAE,EAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,IAAA,eAAM,EAAC,IAAA,2BAAY,EAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC9D,IAAA,eAAM,EAAC,IAAA,2BAAY,EAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAWH,IAAA,iBAAQ,EAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,IAAA,WAAE,EAAC,yBAAyB,EAAE,GAAG,EAAE;QACjC,IAAA,eAAM,EAAC,IAAA,4BAAa,EAAC,uCAAuC,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACrF,IAAA,eAAM,EAAC,IAAA,4BAAa,EAAC,8BAA8B,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,IAAA,WAAE,EAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,IAAA,eAAM,EAAC,IAAA,4BAAa,EAAC,sCAAsC,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CACzF,0BAA0B,CAC3B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAA,iBAAQ,EAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,IAAA,WAAE,EAAC,4DAA4D,EAAE,GAAG,EAAE;QACpE,IAAA,eAAM,EACJ,IAAA,oCAAqB,EACnB,0EAA0E,EAC1E,GAAG,CACJ,CACF,CAAC,IAAI,CAAC,8EAA8E,CAAC,CAAC;IACzF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -4,4 +4,4 @@ export interface QuillDeltaToHtmlOptions {
4
4
  absoluteImageUrls?: boolean;
5
5
  }
6
6
  export declare function convertQuillDeltaToHtml(siteContext: SiteContext, renderingContext: RenderingContext, delta: any, options?: QuillDeltaToHtmlOptions): Promise<string>;
7
- export declare function convertQuillDeltaToHtmlNoImage(delta: any): string;
7
+ export declare function convertQuillDeltaToPlainText(delta: any): string;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.convertQuillDeltaToHtmlNoImage = exports.convertQuillDeltaToHtml = void 0;
3
+ exports.convertQuillDeltaToPlainText = exports.convertQuillDeltaToHtml = void 0;
4
4
  const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
5
5
  const quill_delta_to_html_1 = require("@paroi/quill-delta-to-html");
6
6
  const server_image_cache_engine_1 = require("@paroicms/server-image-cache-engine");
@@ -22,7 +22,7 @@ async function convertQuillDeltaToHtml(siteContext, renderingContext, delta, opt
22
22
  return await converter.convert();
23
23
  }
24
24
  exports.convertQuillDeltaToHtml = convertQuillDeltaToHtml;
25
- function convertQuillDeltaToHtmlNoImage(delta) {
25
+ function convertQuillDeltaToPlainText(delta) {
26
26
  const converter = new quill_delta_to_html_1.QuillDeltaToHtmlConverter(delta.ops);
27
27
  converter.renderCustomWith((customOp) => {
28
28
  const { type, value } = customOp.insert;
@@ -33,9 +33,32 @@ function convertQuillDeltaToHtmlNoImage(delta) {
33
33
  context_1.platformLog.warn(`Invalid blot '${type}'`);
34
34
  return "";
35
35
  });
36
- return converter.convert();
36
+ const html = converter.convert();
37
+ return decodeHtmlEntities((0, html_helpers_1.stripHtmlTags)(html, { blockSeparator: " – " }));
38
+ }
39
+ exports.convertQuillDeltaToPlainText = convertQuillDeltaToPlainText;
40
+ function decodeHtmlEntities(str) {
41
+ const entities = {
42
+ "&lt;": "<",
43
+ "&#60;": "<",
44
+ "&#x3C;": "<",
45
+ "&gt;": ">",
46
+ "&#62;": ">",
47
+ "&#x3E;": ">",
48
+ "&#47;": "/",
49
+ "&#x2F;": "/",
50
+ "&apos;": "'",
51
+ "&#39;": "'",
52
+ "&#x27;": "'",
53
+ "&quot;": '"',
54
+ "&#34;": '"',
55
+ "&#x22;": '"',
56
+ "&amp;": "&",
57
+ "&#38;": "&",
58
+ "&#x26;": "&",
59
+ };
60
+ return str.replace(/&lt;|&#60;|&#x3C;|&gt;|&#62;|&#x3E;|&#47;|&#x2F;|&apos;|&#39;|&#x27;|&quot;|&#34;|&#x22;|&amp;|&#38;|&#x26;/g, (match) => entities[match]);
37
61
  }
38
- exports.convertQuillDeltaToHtmlNoImage = convertQuillDeltaToHtmlNoImage;
39
62
  async function imgBlotProcessing(siteContext, renderingContext, value, options) {
40
63
  const uid = (0, data_formatters_lib_1.strValOrUndef)(value.uid, { varName: "uid" });
41
64
  const variant = (0, data_formatters_lib_1.strValOrUndef)(value.variant, { varName: "variant" });
@@ -1 +1 @@
1
- {"version":3,"file":"quill-delta.js","sourceRoot":"","sources":["../../../../src/modules/core/fields/quill-delta.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"quill-delta.js","sourceRoot":"","sources":["../../../../src/modules/core/fields/quill-delta.ts"],"names":[],"mappings":"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"}
@@ -99,10 +99,9 @@ async function saveTextFieldValue(cn, options) {
99
99
  else {
100
100
  let excerpt;
101
101
  if ((0, anywhere_lib_1.isFTextFieldType)(fieldType) && fieldType.useAsExcerpt) {
102
- const html = fieldType.dataType === "quillDelta"
103
- ? (0, quill_delta_1.convertQuillDeltaToHtmlNoImage)(value?.delta)
104
- : (0, data_formatters_lib_1.strVal)(value);
105
- const plainText = (0, html_helpers_1.stripHtmlTags)(html);
102
+ const plainText = fieldType.dataType === "quillDelta"
103
+ ? (0, quill_delta_1.convertQuillDeltaToPlainText)(value?.delta)
104
+ : (0, html_helpers_1.stripHtmlTags)((0, data_formatters_lib_1.strVal)(value), { blockSeparator: " – " });
106
105
  excerpt = (0, excerpt_helpers_1.truncExcerptToWord)(plainText, 299);
107
106
  }
108
107
  await cn
@@ -1 +1 @@
1
- {"version":3,"file":"save-fields.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/fields/save-fields.queries.ts"],"names":[],"mappings":";;;AAAA,2CAAqD;AACrD,oEAAoE;AACpE,yDAOgC;AAEhC,oEAAkE;AAClE,2DAAgF;AAChF,8CAAiD;AACjD,sEAAsE;AAEtE,uDAAsD;AAEtD,+CAA+D;AAE/D,SAAgB,gBAAgB,CAAC,OAAe;IAC9C,IAAI,CAAC;QACH,OAAO,IAAA,wBAAS,EAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,4BAAmB,CAAC,qBAAqB,CAAC,CAAC;IACvD,CAAC;AACH,CAAC;AAND,4CAMC;AAEM,KAAK,UAAU,eAAe,CACnC,WAAiE,EACjE,EACE,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,MAAM,GAMP;IAED,MAAM,UAAU,GAAG,IAAA,4BAAa,EAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACnE,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,IAAI,EAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAErE,MAAM,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QAC5C,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACxD,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzC,IAAI,CAAC,SAAS;gBAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,SAAS,GAAG,CAAC,CAAC;YAEhF,QAAQ,SAAS,CAAC,QAAQ,EAAE,CAAC;gBAC3B,KAAK,SAAS;oBACZ,MAAM,qBAAqB,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;oBACxE,MAAM;gBACR,KAAK,MAAM;oBACT,MAAM,kBAAkB,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;oBACrE,MAAM;gBACR,KAAK,aAAa;oBAChB,MAAM,IAAI,KAAK,CACb,sBAAsB,SAAS,CAAC,QAAQ,YAAY,SAAS,cAAc,CAC5E,CAAC;gBACJ;oBACE,MAAM,IAAI,KAAK,CAAC,uBAAwB,SAAuB,CAAC,QAAQ,GAAG,CAAC,CAAC;YACjF,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,UAAU,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAE/B,MAAM,IAAA,+CAAkC,EAAC,WAAW,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,CAAC;IACpF,CAAC;SAAM,CAAC;QAEN,MAAM,IAAA,+CAAkC,EAAC,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACpE,CAAC;AACH,CAAC;AA/CD,0CA+CC;AAKD,KAAK,UAAU,qBAAqB,CAClC,EAA0B,EAC1B,OAKC;IAED,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,UAAU,GAAG,IAAA,mCAAiB,EAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,uBAAa,CAAC;IACnF,MAAM,GAAG,GAAG,oBAAoB,CAAC,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC5D,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,EAAE;aACb,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,IAAI,CAAC,gBAAgB,CAAC;aACtB,QAAQ,CAAC,gBAAgB,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC;aACrD,QAAQ,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,CAAC;aACxC,QAAQ,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;QAClD,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;SAAM,CAAC;QACN,MAAM,EAAE;aACL,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,IAAI,CAAC,gBAAgB,CAAC;aACtB,MAAM,CAAC;YACN,KAAK,EAAE,SAAS,CAAC,IAAI;YACrB,MAAM;YACN,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,GAAG;SACJ,CAAC;aACD,QAAQ,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE;YAC1D,2BAA2B,EAAE,IAAI;SAClC,CAAC;aACD,OAAO,EAAE,CAAC;IACf,CAAC;AACH,CAAC;AAKD,KAAK,UAAU,kBAAkB,CAC/B,EAA0B,EAC1B,OAKC;IAED,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,UAAU,GAAG,IAAA,mCAAiB,EAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,uBAAa,CAAC;IACnF,MAAM,GAAG,GAAG,oBAAoB,CAAC,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC5D,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,EAAE;aACb,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,IAAI,CAAC,aAAa,CAAC;aACnB,QAAQ,CAAC,gBAAgB,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC;aACrD,QAAQ,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,CAAC;aACxC,QAAQ,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;QAC1D,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;SAAM,CAAC;QACN,IAAI,OAA2B,CAAC;QAChC,IAAI,IAAA,+BAAgB,EAAC,SAAS,CAAC,IAAI,SAAS,CAAC,YAAY,EAAE,CAAC;YAC1D,MAAM,IAAI,GACR,SAAS,CAAC,QAAQ,KAAK,YAAY;gBACjC,CAAC,CAAC,IAAA,4CAA8B,EAAE,KAAa,EAAE,KAAK,CAAC;gBACvD,CAAC,CAAC,IAAA,4BAAM,EAAC,KAAK,CAAC,CAAC;YACpB,MAAM,SAAS,GAAG,IAAA,4BAAa,EAAC,IAAI,CAAC,CAAC;YACtC,OAAO,GAAG,IAAA,oCAAkB,EAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAC/C,CAAC;QAED,MAAM,EAAE;aACL,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,IAAI,CAAC,aAAa,CAAC;aACnB,MAAM,CAAC;YACN,KAAK,EAAE,SAAS,CAAC,IAAI;YACrB,MAAM;YACN,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,GAAG;YACH,OAAO;SACR,CAAC;aACD,QAAQ,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE;YACrE,2BAA2B,EAAE,IAAI;SAClC,CAAC;aACD,OAAO,EAAE,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc,EAAE,QAAuB;IACnE,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC5D,IAAI,QAAQ,KAAK,QAAQ;QAAE,OAAO,IAAA,4BAAM,EAAC,KAAK,CAAC,CAAC;IAChD,IAAI,QAAQ,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,IAAA,2BAAK,EAAC,KAAK,CAAC,CAAC,CAAC;IACvD,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,IAAA,6BAAO,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAC9D,IAAI,QAAQ,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACtD,IAAI,QAAQ,KAAK,YAAY;QAAE,OAAO,IAAI,CAAC,SAAS,CAAE,KAAa,CAAC,KAAK,CAAC,CAAC;IAC3E,MAAM,IAAI,KAAK,CAAC,qBAAqB,QAAQ,GAAG,CAAC,CAAC;AACpD,CAAC"}
1
+ {"version":3,"file":"save-fields.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/fields/save-fields.queries.ts"],"names":[],"mappings":";;;AAAA,2CAAqD;AACrD,oEAAoE;AACpE,yDAOgC;AAEhC,oEAAkE;AAClE,2DAAgF;AAChF,8CAAiD;AACjD,sEAAsE;AAEtE,uDAAsD;AAEtD,+CAA6D;AAE7D,SAAgB,gBAAgB,CAAC,OAAe;IAC9C,IAAI,CAAC;QACH,OAAO,IAAA,wBAAS,EAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,4BAAmB,CAAC,qBAAqB,CAAC,CAAC;IACvD,CAAC;AACH,CAAC;AAND,4CAMC;AAEM,KAAK,UAAU,eAAe,CACnC,WAAiE,EACjE,EACE,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,MAAM,GAMP;IAED,MAAM,UAAU,GAAG,IAAA,4BAAa,EAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACnE,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,IAAI,EAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAErE,MAAM,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QAC5C,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACxD,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzC,IAAI,CAAC,SAAS;gBAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,SAAS,GAAG,CAAC,CAAC;YAEhF,QAAQ,SAAS,CAAC,QAAQ,EAAE,CAAC;gBAC3B,KAAK,SAAS;oBACZ,MAAM,qBAAqB,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;oBACxE,MAAM;gBACR,KAAK,MAAM;oBACT,MAAM,kBAAkB,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;oBACrE,MAAM;gBACR,KAAK,aAAa;oBAChB,MAAM,IAAI,KAAK,CACb,sBAAsB,SAAS,CAAC,QAAQ,YAAY,SAAS,cAAc,CAC5E,CAAC;gBACJ;oBACE,MAAM,IAAI,KAAK,CAAC,uBAAwB,SAAuB,CAAC,QAAQ,GAAG,CAAC,CAAC;YACjF,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,UAAU,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAE/B,MAAM,IAAA,+CAAkC,EAAC,WAAW,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,CAAC;IACpF,CAAC;SAAM,CAAC;QAEN,MAAM,IAAA,+CAAkC,EAAC,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACpE,CAAC;AACH,CAAC;AA/CD,0CA+CC;AAKD,KAAK,UAAU,qBAAqB,CAClC,EAA0B,EAC1B,OAKC;IAED,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,UAAU,GAAG,IAAA,mCAAiB,EAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,uBAAa,CAAC;IACnF,MAAM,GAAG,GAAG,oBAAoB,CAAC,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC5D,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,EAAE;aACb,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,IAAI,CAAC,gBAAgB,CAAC;aACtB,QAAQ,CAAC,gBAAgB,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC;aACrD,QAAQ,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,CAAC;aACxC,QAAQ,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;QAClD,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;SAAM,CAAC;QACN,MAAM,EAAE;aACL,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,IAAI,CAAC,gBAAgB,CAAC;aACtB,MAAM,CAAC;YACN,KAAK,EAAE,SAAS,CAAC,IAAI;YACrB,MAAM;YACN,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,GAAG;SACJ,CAAC;aACD,QAAQ,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE;YAC1D,2BAA2B,EAAE,IAAI;SAClC,CAAC;aACD,OAAO,EAAE,CAAC;IACf,CAAC;AACH,CAAC;AAKD,KAAK,UAAU,kBAAkB,CAC/B,EAA0B,EAC1B,OAKC;IAED,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,UAAU,GAAG,IAAA,mCAAiB,EAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,uBAAa,CAAC;IACnF,MAAM,GAAG,GAAG,oBAAoB,CAAC,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC5D,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,EAAE;aACb,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,IAAI,CAAC,aAAa,CAAC;aACnB,QAAQ,CAAC,gBAAgB,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC;aACrD,QAAQ,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,CAAC;aACxC,QAAQ,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;QAC1D,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;SAAM,CAAC;QACN,IAAI,OAA2B,CAAC;QAChC,IAAI,IAAA,+BAAgB,EAAC,SAAS,CAAC,IAAI,SAAS,CAAC,YAAY,EAAE,CAAC;YAC1D,MAAM,SAAS,GACb,SAAS,CAAC,QAAQ,KAAK,YAAY;gBACjC,CAAC,CAAC,IAAA,0CAA4B,EAAE,KAAa,EAAE,KAAK,CAAC;gBACrD,CAAC,CAAC,IAAA,4BAAa,EAAC,IAAA,4BAAM,EAAC,KAAK,CAAC,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;YAC9D,OAAO,GAAG,IAAA,oCAAkB,EAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAC/C,CAAC;QAED,MAAM,EAAE;aACL,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,IAAI,CAAC,aAAa,CAAC;aACnB,MAAM,CAAC;YACN,KAAK,EAAE,SAAS,CAAC,IAAI;YACrB,MAAM;YACN,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,GAAG;YACH,OAAO;SACR,CAAC;aACD,QAAQ,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE;YACrE,2BAA2B,EAAE,IAAI;SAClC,CAAC;aACD,OAAO,EAAE,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc,EAAE,QAAuB;IACnE,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC5D,IAAI,QAAQ,KAAK,QAAQ;QAAE,OAAO,IAAA,4BAAM,EAAC,KAAK,CAAC,CAAC;IAChD,IAAI,QAAQ,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,IAAA,2BAAK,EAAC,KAAK,CAAC,CAAC,CAAC;IACvD,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,IAAA,6BAAO,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAC9D,IAAI,QAAQ,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACtD,IAAI,QAAQ,KAAK,YAAY;QAAE,OAAO,IAAI,CAAC,SAAS,CAAE,KAAa,CAAC,KAAK,CAAC,CAAC;IAC3E,MAAM,IAAI,KAAK,CAAC,qBAAqB,QAAQ,GAAG,CAAC,CAAC;AACpD,CAAC"}
@@ -35,9 +35,10 @@ async function shiftPartLeafOrdersAfterDeletion(cn, leafId) {
35
35
  .addSelect("l.parentId", "parentId")
36
36
  .addSelect("p.listName", "listName")
37
37
  .addSelect("o.orderNum", "orderNum")
38
- .from("PaPartLeaf", "p")
39
- .innerJoin("PaOrderedLeaf", "o", "o.leafId = p.leafId")
40
- .andWhere("p.leafId = :leafId", { leafId })
38
+ .from("PaLeaf", "l")
39
+ .innerJoin("PaPartLeaf", "p", "p.leafId = l.id")
40
+ .innerJoin("PaOrderedLeaf", "o", "o.leafId = l.id")
41
+ .andWhere("l.id = :leafId", { leafId })
41
42
  .getRawOne();
42
43
  if (!row)
43
44
  throw new common_1.NotFoundException(`part-leaf '${leafId}' not found`);
@@ -1 +1 @@
1
- {"version":3,"file":"part-leaf.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/part/part-leaf.queries.ts"],"names":[],"mappings":";;;AAAA,2CAAmD;AACnD,oEAAyE;AAIlE,KAAK,UAAU,cAAc,CAClC,EAA0B,EAC1B,EACE,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,cAAc,EACd,SAAS,GAOV;IAED,MAAM,EAAE;SACL,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,YAAY,CAAC;SAClB,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC;SAC5C,OAAO,EAAE,CAAC;IAEb,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,GAAG,GAAG,MAAM,EAAE;aACjB,kBAAkB,EAAE;aACpB,MAAM,CAAC,iBAAiB,EAAE,UAAU,CAAC;aACrC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;aACnB,SAAS,CAAC,YAAY,EAAE,GAAG,EAAE,iBAAiB,CAAC;aAC/C,SAAS,CAAC,eAAe,EAAE,GAAG,EAAE,iBAAiB,CAAC;aAClD,QAAQ,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,CAAC;aAChD,QAAQ,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,CAAC;aAChD,SAAS,EAAO,CAAC;QAEpB,MAAM,EAAE;aACL,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,IAAI,CAAC,eAAe,CAAC;aACrB,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAA,kCAAY,EAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;aACpE,OAAO,EAAE,CAAC;IACf,CAAC;AACH,CAAC;AAzCD,wCAyCC;AAEM,KAAK,UAAU,gCAAgC,CAAC,EAA0B,EAAE,MAAc;IAC/F,MAAM,GAAG,GAAG,MAAM,EAAE;SACjB,kBAAkB,EAAE;SACpB,SAAS,CAAC,YAAY,EAAE,UAAU,CAAC;SACnC,SAAS,CAAC,YAAY,EAAE,UAAU,CAAC;SACnC,SAAS,CAAC,YAAY,EAAE,UAAU,CAAC;SACnC,IAAI,CAAC,YAAY,EAAE,GAAG,CAAC;SACvB,SAAS,CAAC,eAAe,EAAE,GAAG,EAAE,qBAAqB,CAAC;SACtD,QAAQ,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,CAAC;SAC1C,SAAS,EAAO,CAAC;IAEpB,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,0BAAiB,CAAC,cAAc,MAAM,aAAa,CAAC,CAAC;IAEzE,MAAM,QAAQ,GAAG,IAAA,4BAAM,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,IAAA,4BAAM,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,IAAA,2BAAK,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAErC,MAAM,EAAE;SACL,kBAAkB,EAAE;SACpB,MAAM,CAAC,eAAe,CAAC;SACvB,GAAG,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,cAAc,EAAE,CAAC;SACvC,QAAQ,CAAC,oCAAoC,EAAE,EAAE,QAAQ,EAAE,CAAC;SAC5D,QAAQ,CACP;;;;;;;EAOJ,EACI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CACvB;SACA,OAAO,EAAE,CAAC;AACf,CAAC;AAlCD,4EAkCC"}
1
+ {"version":3,"file":"part-leaf.queries.js","sourceRoot":"","sources":["../../../../src/modules/core/part/part-leaf.queries.ts"],"names":[],"mappings":";;;AAAA,2CAAmD;AACnD,oEAAyE;AAIlE,KAAK,UAAU,cAAc,CAClC,EAA0B,EAC1B,EACE,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,cAAc,EACd,SAAS,GAOV;IAED,MAAM,EAAE;SACL,kBAAkB,EAAE;SACpB,MAAM,EAAE;SACR,IAAI,CAAC,YAAY,CAAC;SAClB,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC;SAC5C,OAAO,EAAE,CAAC;IAEb,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,GAAG,GAAG,MAAM,EAAE;aACjB,kBAAkB,EAAE;aACpB,MAAM,CAAC,iBAAiB,EAAE,UAAU,CAAC;aACrC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;aACnB,SAAS,CAAC,YAAY,EAAE,GAAG,EAAE,iBAAiB,CAAC;aAC/C,SAAS,CAAC,eAAe,EAAE,GAAG,EAAE,iBAAiB,CAAC;aAClD,QAAQ,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,CAAC;aAChD,QAAQ,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,CAAC;aAChD,SAAS,EAAO,CAAC;QAEpB,MAAM,EAAE;aACL,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,IAAI,CAAC,eAAe,CAAC;aACrB,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAA,kCAAY,EAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;aACpE,OAAO,EAAE,CAAC;IACf,CAAC;AACH,CAAC;AAzCD,wCAyCC;AAEM,KAAK,UAAU,gCAAgC,CAAC,EAA0B,EAAE,MAAc;IAC/F,MAAM,GAAG,GAAG,MAAM,EAAE;SACjB,kBAAkB,EAAE;SACpB,SAAS,CAAC,YAAY,EAAE,UAAU,CAAC;SACnC,SAAS,CAAC,YAAY,EAAE,UAAU,CAAC;SACnC,SAAS,CAAC,YAAY,EAAE,UAAU,CAAC;SACnC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;SACnB,SAAS,CAAC,YAAY,EAAE,GAAG,EAAE,iBAAiB,CAAC;SAC/C,SAAS,CAAC,eAAe,EAAE,GAAG,EAAE,iBAAiB,CAAC;SAClD,QAAQ,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,CAAC;SACtC,SAAS,EAAO,CAAC;IAEpB,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,0BAAiB,CAAC,cAAc,MAAM,aAAa,CAAC,CAAC;IAEzE,MAAM,QAAQ,GAAG,IAAA,4BAAM,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,IAAA,4BAAM,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,IAAA,2BAAK,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAErC,MAAM,EAAE;SACL,kBAAkB,EAAE;SACpB,MAAM,CAAC,eAAe,CAAC;SACvB,GAAG,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,cAAc,EAAE,CAAC;SACvC,QAAQ,CAAC,oCAAoC,EAAE,EAAE,QAAQ,EAAE,CAAC;SAC5D,QAAQ,CACP;;;;;;;EAOJ,EACI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CACvB;SACA,OAAO,EAAE,CAAC;AACf,CAAC;AAnCD,4EAmCC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@paroicms/server",
3
- "version": "1.31.4",
3
+ "version": "1.31.5",
4
4
  "description": "The ParoiCMS server",
5
5
  "keywords": [
6
6
  "cms",