Skip to content

Commit ce76952

Browse files
committed
✨ Also define the shared constants as globals in Hawkejs templates
1 parent 210fca5 commit ce76952

File tree

5 files changed

+36
-13
lines changed

5 files changed

+36
-13
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.4.0-alpha.3 (WIP)
2+
3+
* Also define the shared constants as globals in Hawkejs templates
4+
15
## 1.4.0-alpha.2 (2024-02-19)
26

37
* Drop the correct already-existing index when trying to create a similar one

lib/bootstrap.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ const libpath = require('path');
77
*/
88
const Protoblast = require('protoblast')(true);
99

10+
/**
11+
* Require Hawkejs next
12+
*/
13+
require('hawkejs');
14+
1015
/**
1116
* Define shared global constants and require methods
1217
*/

lib/scripts/create_shared_constants.js

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,21 @@ function DEFINE(name, value) {
1717
Object.defineProperty(globalThis, name, {value: value});
1818
}
1919

20+
/**
21+
* Function to define global constants
22+
* and have them inside Hawkejs views too
23+
*
24+
* @author Jelle De Loecker <jelle@elevenways.be>
25+
* @since 1.4.0
26+
* @version 1.4.0
27+
*
28+
* @type {Function}
29+
*/
30+
function DEFINE_CLIENT(name, value) {
31+
DEFINE(name, value);
32+
Classes.Hawkejs.setGlobal(name, value);
33+
}
34+
2035
/**
2136
* Use DEFINE for itself
2237
*
@@ -37,7 +52,7 @@ DEFINE('DEFINE', DEFINE);
3752
*
3853
* @type {Informer}
3954
*/
40-
DEFINE('Blast', __Protoblast);
55+
DEFINE_CLIENT('Blast', __Protoblast);
4156

4257
/**
4358
* All classes will be collected here
@@ -48,7 +63,7 @@ DEFINE('Blast', __Protoblast);
4863
*
4964
* @type {Object}
5065
*/
51-
DEFINE('Classes', Blast.Classes);
66+
DEFINE_CLIENT('Classes', Blast.Classes);
5267

5368
/**
5469
* Available types
@@ -59,7 +74,7 @@ DEFINE('Classes', Blast.Classes);
5974
*
6075
* @type {Object}
6176
*/
62-
DEFINE('Types', Blast.Types);
77+
DEFINE_CLIENT('Types', Blast.Types);
6378

6479
/**
6580
* The new Local Date/Time classes
@@ -68,9 +83,9 @@ DEFINE('Types', Blast.Types);
6883
* @since 1.3.20
6984
* @version 1.3.20
7085
*/
71-
DEFINE('LocalDateTime', Classes.Develry.LocalDateTime);
72-
DEFINE('LocalDate', Classes.Develry.LocalDate);
73-
DEFINE('LocalTime', Classes.Develry.LocalTime);
86+
DEFINE_CLIENT('LocalDateTime', Classes.Develry.LocalDateTime);
87+
DEFINE_CLIENT('LocalDate', Classes.Develry.LocalDate);
88+
DEFINE_CLIENT('LocalTime', Classes.Develry.LocalTime);
7489

7590
/**
7691
* The new Decimal classes
@@ -79,10 +94,10 @@ DEFINE('LocalTime', Classes.Develry.LocalTime);
7994
* @since 1.3.20
8095
* @version 1.3.20
8196
*/
82-
DEFINE('Decimal', Classes.Develry.Decimal);
83-
DEFINE('MutableDecimal', Classes.Develry.MutableDecimal);
84-
DEFINE('FixedDecimal', Classes.Develry.FixedDecimal);
85-
DEFINE('MutableFixedDecimal', Classes.Develry.MutableFixedDecimal);
97+
DEFINE_CLIENT('Decimal', Classes.Develry.Decimal);
98+
DEFINE_CLIENT('MutableDecimal', Classes.Develry.MutableDecimal);
99+
DEFINE_CLIENT('FixedDecimal', Classes.Develry.FixedDecimal);
100+
DEFINE_CLIENT('MutableFixedDecimal', Classes.Develry.MutableFixedDecimal);
86101

87102
/**
88103
* The Trail class:
@@ -92,4 +107,4 @@ DEFINE('MutableFixedDecimal', Classes.Develry.MutableFixedDecimal);
92107
* @since 1.4.0
93108
* @version 1.4.0
94109
*/
95-
DEFINE('Trail', Classes.Develry.Trail);
110+
DEFINE_CLIENT('Trail', Classes.Develry.Trail);

lib/scripts/preload_modules.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ alchemy.use('less', 'less');
4949
*
5050
* @link https://npmjs.org/package/hawkejs
5151
*/
52-
alchemy.use('hawkejs', 'hawkejs');
5352
alchemy.hawkejs = Classes.Hawkejs.Hawkejs.getInstance();
5453

5554
/**

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "alchemymvc",
33
"description": "MVC framework for Node.js",
4-
"version": "1.4.0-alpha.2",
4+
"version": "1.4.0-alpha.3",
55
"author": "Jelle De Loecker <jelle@elevenways.be>",
66
"keywords": [
77
"alchemy",

0 commit comments

Comments
 (0)