elegance-js 1.11.28 → 1.11.30

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/dist/build.mjs CHANGED
@@ -443,7 +443,9 @@ var generateSuitablePageElements = async (pageLocation, pageElements, metadata,
443
443
  };
444
444
  var generateClientPageData = async (pageLocation, state, objectAttributes, pageLoadHooks, DIST_DIR, pageName) => {
445
445
  const pageDiff = path.relative(DIST_DIR, pageLocation);
446
- let clientPageJSText = `let url="${pageDiff === "" ? "/" : `/${pageDiff}`}";`;
446
+ let clientPageJSText = `${globalThis.__SERVER_PAGE_DATA_BANNER__}
447
+ /*ELEGANCE_JS*/
448
+ let url="${pageDiff === "" ? "/" : `/${pageDiff}`}";`;
447
449
  {
448
450
  clientPageJSText += `export const data = {`;
449
451
  if (state) {
@@ -540,6 +542,7 @@ var buildDynamicPage = async (filePath, DIST_DIR, req, res) => {
540
542
  initializeState();
541
543
  initializeObjectAttributes();
542
544
  resetLoadHooks();
545
+ globalThis.__SERVER_PAGE_DATA_BANNER__ = "";
543
546
  globalThis.__SERVER_CURRENT_STATE_ID__ = 1;
544
547
  try {
545
548
  const {
@@ -570,7 +573,10 @@ var buildDynamicPage = async (filePath, DIST_DIR, req, res) => {
570
573
  throw new Error("Cannot dynamically render a non-dynamic page.");
571
574
  }
572
575
  } catch (e) {
573
- throw new Error(`Error in Dynamic Page: ${filePath} - ${e}`);
576
+ throw `${filePath} - ${e}
577
+ ${e?.stack ?? "No stack."}
578
+
579
+ `;
574
580
  }
575
581
  if (!metadata || metadata && typeof metadata !== "function") {
576
582
  console.warn(`WARNING: Dynamic ${filePath} does not export a metadata function. This is *highly* recommended.`);
@@ -581,8 +587,9 @@ var buildDynamicPage = async (filePath, DIST_DIR, req, res) => {
581
587
  if (typeof pageElements === "function") {
582
588
  if (pageElements.constructor.name === "AsyncFunction") {
583
589
  pageElements = await pageElements();
590
+ } else {
591
+ pageElements = pageElements();
584
592
  }
585
- pageElements = pageElements();
586
593
  }
587
594
  const state = getState();
588
595
  const pageLoadHooks = getLoadHooks();
@@ -446,7 +446,9 @@ var generateSuitablePageElements = async (pageLocation, pageElements, metadata,
446
446
  };
447
447
  var generateClientPageData = async (pageLocation, state, objectAttributes, pageLoadHooks, DIST_DIR, pageName) => {
448
448
  const pageDiff = path.relative(DIST_DIR, pageLocation);
449
- let clientPageJSText = `let url="${pageDiff === "" ? "/" : `/${pageDiff}`}";`;
449
+ let clientPageJSText = `${globalThis.__SERVER_PAGE_DATA_BANNER__}
450
+ /*ELEGANCE_JS*/
451
+ let url="${pageDiff === "" ? "/" : `/${pageDiff}`}";`;
450
452
  {
451
453
  clientPageJSText += `export const data = {`;
452
454
  if (state) {
@@ -543,6 +545,7 @@ var buildDynamicPage = async (filePath, DIST_DIR, req, res) => {
543
545
  initializeState();
544
546
  initializeObjectAttributes();
545
547
  resetLoadHooks();
548
+ globalThis.__SERVER_PAGE_DATA_BANNER__ = "";
546
549
  globalThis.__SERVER_CURRENT_STATE_ID__ = 1;
547
550
  try {
548
551
  const {
@@ -573,7 +576,10 @@ var buildDynamicPage = async (filePath, DIST_DIR, req, res) => {
573
576
  throw new Error("Cannot dynamically render a non-dynamic page.");
574
577
  }
575
578
  } catch (e) {
576
- throw new Error(`Error in Dynamic Page: ${filePath} - ${e}`);
579
+ throw `${filePath} - ${e}
580
+ ${e?.stack ?? "No stack."}
581
+
582
+ `;
577
583
  }
578
584
  if (!metadata || metadata && typeof metadata !== "function") {
579
585
  console.warn(`WARNING: Dynamic ${filePath} does not export a metadata function. This is *highly* recommended.`);
@@ -584,8 +590,9 @@ var buildDynamicPage = async (filePath, DIST_DIR, req, res) => {
584
590
  if (typeof pageElements === "function") {
585
591
  if (pageElements.constructor.name === "AsyncFunction") {
586
592
  pageElements = await pageElements();
593
+ } else {
594
+ pageElements = pageElements();
587
595
  }
588
- pageElements = pageElements();
589
596
  }
590
597
  const state = getState();
591
598
  const pageLoadHooks = getLoadHooks();
@@ -399,7 +399,9 @@ var generateSuitablePageElements = async (pageLocation, pageElements, metadata,
399
399
  };
400
400
  var generateClientPageData = async (pageLocation, state, objectAttributes, pageLoadHooks, DIST_DIR, pageName) => {
401
401
  const pageDiff = path.relative(DIST_DIR, pageLocation);
402
- let clientPageJSText = `let url="${pageDiff === "" ? "/" : `/${pageDiff}`}";`;
402
+ let clientPageJSText = `${globalThis.__SERVER_PAGE_DATA_BANNER__}
403
+ /*ELEGANCE_JS*/
404
+ let url="${pageDiff === "" ? "/" : `/${pageDiff}`}";`;
403
405
  {
404
406
  clientPageJSText += `export const data = {`;
405
407
  if (state) {
@@ -496,6 +498,7 @@ var buildDynamicPage = async (filePath, DIST_DIR, req, res) => {
496
498
  initializeState();
497
499
  initializeObjectAttributes();
498
500
  resetLoadHooks();
501
+ globalThis.__SERVER_PAGE_DATA_BANNER__ = "";
499
502
  globalThis.__SERVER_CURRENT_STATE_ID__ = 1;
500
503
  try {
501
504
  const {
@@ -526,7 +529,10 @@ var buildDynamicPage = async (filePath, DIST_DIR, req, res) => {
526
529
  throw new Error("Cannot dynamically render a non-dynamic page.");
527
530
  }
528
531
  } catch (e) {
529
- throw new Error(`Error in Dynamic Page: ${filePath} - ${e}`);
532
+ throw `${filePath} - ${e}
533
+ ${e?.stack ?? "No stack."}
534
+
535
+ `;
530
536
  }
531
537
  if (!metadata || metadata && typeof metadata !== "function") {
532
538
  console.warn(`WARNING: Dynamic ${filePath} does not export a metadata function. This is *highly* recommended.`);
@@ -537,8 +543,9 @@ var buildDynamicPage = async (filePath, DIST_DIR, req, res) => {
537
543
  if (typeof pageElements === "function") {
538
544
  if (pageElements.constructor.name === "AsyncFunction") {
539
545
  pageElements = await pageElements();
546
+ } else {
547
+ pageElements = pageElements();
540
548
  }
541
- pageElements = pageElements();
542
549
  }
543
550
  const state = getState();
544
551
  const pageLoadHooks = getLoadHooks();
package/dist/global.d.ts CHANGED
@@ -14,6 +14,8 @@ declare global {
14
14
  var __SERVER_CURRENT_LOADHOOKS__: Array<any>;
15
15
  var __SERVER_CURRENT_LAYOUTS__: Map<string, number>;
16
16
  var __SERVER_CURRENT_LAYOUT_ID__: number;
17
+ /** This is prepended to page_data.js */
18
+ var __SERVER_PAGE_DATA_BANNER__: string;
17
19
  type AnyBuiltElement = BuiltElement<ElementTags> | ChildrenLessBuiltElement<ChildrenlessElementTags>;
18
20
  type BuiltElement<T> = {
19
21
  tag: T;
@@ -553,7 +553,7 @@ var generateSuitablePageElements = async (pageLocation, pageElements, metadata,
553
553
  };
554
554
  var generateClientPageData = async (pageLocation, state, objectAttributes, pageLoadHooks, DIST_DIR2, pageName) => {
555
555
  const pageDiff = path.relative(DIST_DIR2, pageLocation);
556
- let clientPageJSText = `let url="${pageDiff === "" ? "/" : `/${pageDiff}`}";`;
556
+ let clientPageJSText = `${globalThis.__SERVER_PAGE_DATA_BANNER__}let url="${pageDiff === "" ? "/" : `/${pageDiff}`}";`;
557
557
  {
558
558
  clientPageJSText += `export const data = {`;
559
559
  if (state) {
@@ -677,6 +677,7 @@ var buildPage = async (DIST_DIR2, directory, filePath, name) => {
677
677
  initializeState();
678
678
  initializeObjectAttributes();
679
679
  resetLoadHooks();
680
+ globalThis.__SERVER_PAGE_DATA_BANNER__ = "";
680
681
  let pageElements;
681
682
  let metadata;
682
683
  try {
@@ -399,7 +399,9 @@ var generateSuitablePageElements = async (pageLocation, pageElements, metadata,
399
399
  };
400
400
  var generateClientPageData = async (pageLocation, state, objectAttributes, pageLoadHooks, DIST_DIR, pageName) => {
401
401
  const pageDiff = path.relative(DIST_DIR, pageLocation);
402
- let clientPageJSText = `let url="${pageDiff === "" ? "/" : `/${pageDiff}`}";`;
402
+ let clientPageJSText = `${globalThis.__SERVER_PAGE_DATA_BANNER__}
403
+ /*ELEGANCE_JS*/
404
+ let url="${pageDiff === "" ? "/" : `/${pageDiff}`}";`;
403
405
  {
404
406
  clientPageJSText += `export const data = {`;
405
407
  if (state) {
@@ -496,6 +498,7 @@ var buildDynamicPage = async (filePath, DIST_DIR, req, res) => {
496
498
  initializeState();
497
499
  initializeObjectAttributes();
498
500
  resetLoadHooks();
501
+ globalThis.__SERVER_PAGE_DATA_BANNER__ = "";
499
502
  globalThis.__SERVER_CURRENT_STATE_ID__ = 1;
500
503
  try {
501
504
  const {
@@ -526,7 +529,10 @@ var buildDynamicPage = async (filePath, DIST_DIR, req, res) => {
526
529
  throw new Error("Cannot dynamically render a non-dynamic page.");
527
530
  }
528
531
  } catch (e) {
529
- throw new Error(`Error in Dynamic Page: ${filePath} - ${e}`);
532
+ throw `${filePath} - ${e}
533
+ ${e?.stack ?? "No stack."}
534
+
535
+ `;
530
536
  }
531
537
  if (!metadata || metadata && typeof metadata !== "function") {
532
538
  console.warn(`WARNING: Dynamic ${filePath} does not export a metadata function. This is *highly* recommended.`);
@@ -537,8 +543,9 @@ var buildDynamicPage = async (filePath, DIST_DIR, req, res) => {
537
543
  if (typeof pageElements === "function") {
538
544
  if (pageElements.constructor.name === "AsyncFunction") {
539
545
  pageElements = await pageElements();
546
+ } else {
547
+ pageElements = pageElements();
540
548
  }
541
- pageElements = pageElements();
542
549
  }
543
550
  const state = getState();
544
551
  const pageLoadHooks = getLoadHooks();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "elegance-js",
3
- "version": "1.11.28",
3
+ "version": "1.11.30",
4
4
  "description": "Web-Framework",
5
5
  "type": "module",
6
6
  "bin": {