elegance-js 1.11.24 → 1.11.26

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.
Files changed (13) hide show
  1. package/dist/build.mjs +16 -3
  2. package/dist/compile_docs.mjs +16 -3
  3. package/dist/docs/docs/basics/page.mjs +1 -2
  4. package/dist/docs/docs/components/DocsLayout.mjs +1 -2
  5. package/dist/docs/docs/concepts/page.mjs +1 -2
  6. package/dist/docs/docs/page-files/page.mjs +1 -2
  7. package/dist/dynamic_page.d.ts +1 -1
  8. package/dist/dynamic_page.mjs +12 -2
  9. package/dist/page_compiler.mjs +0 -1
  10. package/dist/server/layout.d.ts +1 -1
  11. package/dist/server/layout.mjs +1 -2
  12. package/dist/server/server.mjs +16 -3
  13. package/package.json +1 -1
package/dist/build.mjs CHANGED
@@ -534,7 +534,7 @@ var generateClientPageData = async (pageLocation, state, objectAttributes, pageL
534
534
  fs.writeFileSync(pageDataPath, transformedResult.code, "utf-8");
535
535
  return { sendHardReloadInstruction };
536
536
  };
537
- var buildDynamicPage = async (filePath, DIST_DIR, req) => {
537
+ var buildDynamicPage = async (filePath, DIST_DIR, req, res) => {
538
538
  let pageElements;
539
539
  let metadata;
540
540
  initializeState();
@@ -552,7 +552,17 @@ var buildDynamicPage = async (filePath, DIST_DIR, req) => {
552
552
  requestHook
553
553
  } = construct();
554
554
  if (typeof requestHook === "function") {
555
- requestHook(req);
555
+ if (requestHook.constructor.name === "AsyncFunction") {
556
+ const doProcessRequest = await requestHook(req, res);
557
+ if (doProcessRequest !== void 0 == doProcessRequest === false) {
558
+ return false;
559
+ }
560
+ } else {
561
+ const doProcessRequest = requestHook(req, res);
562
+ if (doProcessRequest !== void 0 == doProcessRequest === false) {
563
+ return false;
564
+ }
565
+ }
556
566
  }
557
567
  pageElements = page;
558
568
  metadata = pageMetadata;
@@ -752,7 +762,10 @@ async function handleStaticRequest(root, pathname, req, res, DIST_DIR) {
752
762
  }
753
763
  if (isDynamic) {
754
764
  try {
755
- const resultHTML = await buildDynamicPage(resolve(handlerPath), DIST_DIR, req2);
765
+ const resultHTML = await buildDynamicPage(resolve(handlerPath), DIST_DIR, req2, res2);
766
+ if (resultHTML === false) {
767
+ return;
768
+ }
756
769
  res2.writeHead(200, { "Content-Type": MIME_TYPES[".html"] });
757
770
  res2.end(resultHTML);
758
771
  } catch (err) {
package/dist/compile_docs.mjs CHANGED
@@ -537,7 +537,7 @@ var generateClientPageData = async (pageLocation, state, objectAttributes, pageL
537
537
  fs.writeFileSync(pageDataPath, transformedResult.code, "utf-8");
538
538
  return { sendHardReloadInstruction };
539
539
  };
540
- var buildDynamicPage = async (filePath, DIST_DIR, req) => {
540
+ var buildDynamicPage = async (filePath, DIST_DIR, req, res) => {
541
541
  let pageElements;
542
542
  let metadata;
543
543
  initializeState();
@@ -555,7 +555,17 @@ var buildDynamicPage = async (filePath, DIST_DIR, req) => {
555
555
  requestHook
556
556
  } = construct();
557
557
  if (typeof requestHook === "function") {
558
- requestHook(req);
558
+ if (requestHook.constructor.name === "AsyncFunction") {
559
+ const doProcessRequest = await requestHook(req, res);
560
+ if (doProcessRequest !== void 0 == doProcessRequest === false) {
561
+ return false;
562
+ }
563
+ } else {
564
+ const doProcessRequest = requestHook(req, res);
565
+ if (doProcessRequest !== void 0 == doProcessRequest === false) {
566
+ return false;
567
+ }
568
+ }
559
569
  }
560
570
  pageElements = page;
561
571
  metadata = pageMetadata;
@@ -755,7 +765,10 @@ async function handleStaticRequest(root, pathname, req, res, DIST_DIR) {
755
765
  }
756
766
  if (isDynamic) {
757
767
  try {
758
- const resultHTML = await buildDynamicPage(resolve(handlerPath), DIST_DIR, req2);
768
+ const resultHTML = await buildDynamicPage(resolve(handlerPath), DIST_DIR, req2, res2);
769
+ if (resultHTML === false) {
770
+ return;
771
+ }
759
772
  res2.writeHead(200, { "Content-Type": MIME_TYPES[".html"] });
760
773
  res2.end(resultHTML);
761
774
  } catch (err) {
package/dist/docs/docs/basics/page.mjs CHANGED
@@ -506,11 +506,10 @@ var CodeBlock = (value, parse = true) => div(
506
506
 
507
507
  // src/server/layout.ts
508
508
  if (!globalThis.__SERVER_CURRENT_LAYOUT_ID__) globalThis.__SERVER_CURRENT_LAYOUT_ID__ = 1;
509
- var layoutId = globalThis.__SERVER_CURRENT_LAYOUT_ID__;
510
509
  var createLayout = (name) => {
511
510
  const layouts = globalThis.__SERVER_CURRENT_LAYOUTS__;
512
511
  if (layouts.has(name)) return layouts.get(name);
513
- const id = layoutId += 1;
512
+ const id = globalThis.__SERVER_CURRENT_LAYOUT_ID__ += 1;
514
513
  layouts.set(name, id);
515
514
  return id;
516
515
  };
package/dist/docs/docs/components/DocsLayout.mjs CHANGED
@@ -309,11 +309,10 @@ var Toast = (bind) => {
309
309
 
310
310
  // src/server/layout.ts
311
311
  if (!globalThis.__SERVER_CURRENT_LAYOUT_ID__) globalThis.__SERVER_CURRENT_LAYOUT_ID__ = 1;
312
- var layoutId = globalThis.__SERVER_CURRENT_LAYOUT_ID__;
313
312
  var createLayout = (name) => {
314
313
  const layouts = globalThis.__SERVER_CURRENT_LAYOUTS__;
315
314
  if (layouts.has(name)) return layouts.get(name);
316
- const id = layoutId += 1;
315
+ const id = globalThis.__SERVER_CURRENT_LAYOUT_ID__ += 1;
317
316
  layouts.set(name, id);
318
317
  return id;
319
318
  };
package/dist/docs/docs/concepts/page.mjs CHANGED
@@ -499,11 +499,10 @@ var Header = () => header(
499
499
 
500
500
  // src/server/layout.ts
501
501
  if (!globalThis.__SERVER_CURRENT_LAYOUT_ID__) globalThis.__SERVER_CURRENT_LAYOUT_ID__ = 1;
502
- var layoutId = globalThis.__SERVER_CURRENT_LAYOUT_ID__;
503
502
  var createLayout = (name) => {
504
503
  const layouts = globalThis.__SERVER_CURRENT_LAYOUTS__;
505
504
  if (layouts.has(name)) return layouts.get(name);
506
- const id = layoutId += 1;
505
+ const id = globalThis.__SERVER_CURRENT_LAYOUT_ID__ += 1;
507
506
  layouts.set(name, id);
508
507
  return id;
509
508
  };
package/dist/docs/docs/page-files/page.mjs CHANGED
@@ -499,11 +499,10 @@ var Header = () => header(
499
499
 
500
500
  // src/server/layout.ts
501
501
  if (!globalThis.__SERVER_CURRENT_LAYOUT_ID__) globalThis.__SERVER_CURRENT_LAYOUT_ID__ = 1;
502
- var layoutId = globalThis.__SERVER_CURRENT_LAYOUT_ID__;
503
502
  var createLayout = (name) => {
504
503
  const layouts = globalThis.__SERVER_CURRENT_LAYOUTS__;
505
504
  if (layouts.has(name)) return layouts.get(name);
506
- const id = layoutId += 1;
505
+ const id = globalThis.__SERVER_CURRENT_LAYOUT_ID__ += 1;
507
506
  layouts.set(name, id);
508
507
  return id;
509
508
  };
package/dist/dynamic_page.d.ts CHANGED
@@ -1,2 +1,2 @@
1
1
  export declare const processPageElements: (element: Child, objectAttributes: Array<any>, parent: Child) => Child;
2
- export declare const buildDynamicPage: (filePath: string, DIST_DIR: string, req: any) => Promise<string>;
2
+ export declare const buildDynamicPage: (filePath: string, DIST_DIR: string, req: any, res: any) => Promise<string | false>;
package/dist/dynamic_page.mjs CHANGED
@@ -490,7 +490,7 @@ var generateClientPageData = async (pageLocation, state, objectAttributes, pageL
490
490
  fs.writeFileSync(pageDataPath, transformedResult.code, "utf-8");
491
491
  return { sendHardReloadInstruction };
492
492
  };
493
- var buildDynamicPage = async (filePath, DIST_DIR, req) => {
493
+ var buildDynamicPage = async (filePath, DIST_DIR, req, res) => {
494
494
  let pageElements;
495
495
  let metadata;
496
496
  initializeState();
@@ -508,7 +508,17 @@ var buildDynamicPage = async (filePath, DIST_DIR, req) => {
508
508
  requestHook
509
509
  } = construct();
510
510
  if (typeof requestHook === "function") {
511
- requestHook(req);
511
+ if (requestHook.constructor.name === "AsyncFunction") {
512
+ const doProcessRequest = await requestHook(req, res);
513
+ if (doProcessRequest !== void 0 == doProcessRequest === false) {
514
+ return false;
515
+ }
516
+ } else {
517
+ const doProcessRequest = requestHook(req, res);
518
+ if (doProcessRequest !== void 0 == doProcessRequest === false) {
519
+ return false;
520
+ }
521
+ }
512
522
  }
513
523
  pageElements = page;
514
524
  metadata = pageMetadata;
package/dist/page_compiler.mjs CHANGED
@@ -258,7 +258,6 @@ var getLoadHooks = () => globalThis.__SERVER_CURRENT_LOADHOOKS__;
258
258
  // src/server/layout.ts
259
259
  var resetLayouts = () => globalThis.__SERVER_CURRENT_LAYOUTS__ = /* @__PURE__ */ new Map();
260
260
  if (!globalThis.__SERVER_CURRENT_LAYOUT_ID__) globalThis.__SERVER_CURRENT_LAYOUT_ID__ = 1;
261
- var layoutId = globalThis.__SERVER_CURRENT_LAYOUT_ID__;
262
261
 
263
262
  // src/page_compiler.ts
264
263
  var packageDir = process.env.PACKAGE_PATH;
package/dist/server/layout.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  export declare const resetLayouts: () => Map<any, any>;
2
2
  export declare const getLayouts: () => Map<string, number>;
3
- export declare const createLayout: (name: string) => number | undefined;
3
+ export declare const createLayout: (name: string) => number;
package/dist/server/layout.mjs CHANGED
@@ -2,11 +2,10 @@
2
2
  var resetLayouts = () => globalThis.__SERVER_CURRENT_LAYOUTS__ = /* @__PURE__ */ new Map();
3
3
  var getLayouts = () => globalThis.__SERVER_CURRENT_LAYOUTS__;
4
4
  if (!globalThis.__SERVER_CURRENT_LAYOUT_ID__) globalThis.__SERVER_CURRENT_LAYOUT_ID__ = 1;
5
- var layoutId = globalThis.__SERVER_CURRENT_LAYOUT_ID__;
6
5
  var createLayout = (name) => {
7
6
  const layouts = globalThis.__SERVER_CURRENT_LAYOUTS__;
8
7
  if (layouts.has(name)) return layouts.get(name);
9
- const id = layoutId += 1;
8
+ const id = globalThis.__SERVER_CURRENT_LAYOUT_ID__ += 1;
10
9
  layouts.set(name, id);
11
10
  return id;
12
11
  };
package/dist/server/server.mjs CHANGED
@@ -490,7 +490,7 @@ var generateClientPageData = async (pageLocation, state, objectAttributes, pageL
490
490
  fs.writeFileSync(pageDataPath, transformedResult.code, "utf-8");
491
491
  return { sendHardReloadInstruction };
492
492
  };
493
- var buildDynamicPage = async (filePath, DIST_DIR, req) => {
493
+ var buildDynamicPage = async (filePath, DIST_DIR, req, res) => {
494
494
  let pageElements;
495
495
  let metadata;
496
496
  initializeState();
@@ -508,7 +508,17 @@ var buildDynamicPage = async (filePath, DIST_DIR, req) => {
508
508
  requestHook
509
509
  } = construct();
510
510
  if (typeof requestHook === "function") {
511
- requestHook(req);
511
+ if (requestHook.constructor.name === "AsyncFunction") {
512
+ const doProcessRequest = await requestHook(req, res);
513
+ if (doProcessRequest !== void 0 == doProcessRequest === false) {
514
+ return false;
515
+ }
516
+ } else {
517
+ const doProcessRequest = requestHook(req, res);
518
+ if (doProcessRequest !== void 0 == doProcessRequest === false) {
519
+ return false;
520
+ }
521
+ }
512
522
  }
513
523
  pageElements = page;
514
524
  metadata = pageMetadata;
@@ -744,7 +754,10 @@ async function handleStaticRequest(root, pathname, req, res, DIST_DIR) {
744
754
  }
745
755
  if (isDynamic) {
746
756
  try {
747
- const resultHTML = await buildDynamicPage(resolve(handlerPath), DIST_DIR, req2);
757
+ const resultHTML = await buildDynamicPage(resolve(handlerPath), DIST_DIR, req2, res2);
758
+ if (resultHTML === false) {
759
+ return;
760
+ }
748
761
  res2.writeHead(200, { "Content-Type": MIME_TYPES[".html"] });
749
762
  res2.end(resultHTML);
750
763
  } catch (err) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "elegance-js",
3
- "version": "1.11.24",
3
+ "version": "1.11.26",
4
4
  "description": "Web-Framework",
5
5
  "type": "module",
6
6
  "bin": {