rebuildjs 0.67.9 → 0.68.2

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 (10) hide show
  1. package/package.json +2 -2
  2. package/server/app/index.js +70 -45
  3. package/server/app/index.test.ts +60 -58
  4. package/server/asset/index.js +9 -7
  5. package/server/build/index.js +90 -76
  6. package/server/metafile/index.js +10 -8
  7. package/server/rebuildjs_browser/index.js +94 -77
  8. package/server/rebuildjs_browser/index.test.ts +20 -20
  9. package/server/rebuildjs_server/index.js +92 -78
  10. package/server/rebuildjs_server/index.test.ts +42 -45
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "rebuildjs",
3
- "version": "0.67.9",
3
+ "version": "0.68.2",
4
4
  "description": "Reactive esbuild...simple hackable alternative to vite for Multi Page Apps",
5
5
  "keywords": [
6
6
  "reactive",
@@ -54,7 +54,7 @@
54
54
  "./package.json": "./package.json"
55
55
  },
56
56
  "dependencies": {
57
- "ctx-core": "^6.8.3",
57
+ "ctx-core": "^7.0.1",
58
58
  "elysia": "^1.0.10",
59
59
  "esbuild": "^0.20.2",
60
60
  "fdir": "^6.1.1",
package/server/app/index.js CHANGED
@@ -1,95 +1,120 @@
1
- import { be_lock_memosig_triple_, be_memo_pair_, be_sig_triple_ } from 'ctx-core/rmemo'
1
+ import { ns_id_be_lock_memosig_triple_, ns_id_be_memo_pair_, ns_id_be_sig_triple_ } from 'ctx-core/rmemo'
2
2
  import { join, relative, resolve } from 'node:path'
3
3
  export const [
4
4
  port$_,
5
5
  port_,
6
6
  port__set,
7
- ] = be_sig_triple_(()=>
8
- process.env.PORT
9
- ? parseInt(process.env.PORT)
10
- : 3000,
11
- { ns: 'app', id: 'port' })
7
+ ] = ns_id_be_sig_triple_(
8
+ 'app',
9
+ 'port',
10
+ ()=>
11
+ process.env.PORT
12
+ ? parseInt(process.env.PORT)
13
+ : 3000)
12
14
  export const [
13
15
  cwd$_,
14
16
  cwd_,
15
17
  cwd__set,
16
- ] = be_sig_triple_(()=>
17
- resolve('.'),
18
- { ns: 'app', id: 'cwd' })
18
+ ] = ns_id_be_sig_triple_(
19
+ 'app',
20
+ 'cwd',
21
+ ()=>resolve('.'))
19
22
  export const [
20
23
  is_prod$_,
21
24
  is_prod_,
22
25
  is_prod__set,
23
- ] = be_lock_memosig_triple_(()=>
24
- process.env.NODE_ENV === 'production',
25
- { ns: 'app', id: 'is_prod' })
26
+ ] = ns_id_be_lock_memosig_triple_(
27
+ 'app',
28
+ 'is_prod',
29
+ ()=>process.env.NODE_ENV === 'production')
26
30
  export const [
27
31
  public_path$_,
28
32
  public_path_,
29
33
  public_path__set,
30
- ] = be_lock_memosig_triple_(ctx=>
31
- join(cwd_(ctx), 'public'),
32
- { ns: 'app', id: 'public_path' })
34
+ ] = ns_id_be_lock_memosig_triple_(
35
+ 'app',
36
+ 'public_path',
37
+ ctx=>
38
+ join(cwd_(ctx), 'public'))
33
39
  export const [
34
40
  dist_path$_,
35
41
  dist_path_,
36
42
  dist_path__set,
37
- ] = be_lock_memosig_triple_(ctx=>
38
- join(cwd_(ctx), 'dist'),
39
- { ns: 'app', id: 'dist_path' })
43
+ ] = ns_id_be_lock_memosig_triple_(
44
+ 'app',
45
+ 'dist_path',
46
+ ctx=>
47
+ join(cwd_(ctx), 'dist'))
40
48
  export const [
41
49
  dist__relative_path$_,
42
50
  dist__relative_path_,
43
- ] = be_memo_pair_(ctx=>
44
- relative(cwd_(ctx), dist_path_(ctx)),
45
- { ns: 'app', id: 'dist__relative_path' })
51
+ ] = ns_id_be_memo_pair_(
52
+ 'app',
53
+ 'dist__relative_path',
54
+ ctx=>
55
+ relative(cwd_(ctx), dist_path_(ctx)))
46
56
  export const [
47
57
  src_path$_,
48
58
  src_path_,
49
59
  src_path__set,
50
- ] = be_lock_memosig_triple_(ctx=>
51
- join(cwd_(ctx), 'src'),
52
- { ns: 'app', id: 'src_path' })
60
+ ] = ns_id_be_lock_memosig_triple_(
61
+ 'app',
62
+ 'src_path',
63
+ ctx=>
64
+ join(cwd_(ctx), 'src'))
53
65
  export const [
54
66
  src__relative_path$_,
55
67
  src__relative_path_,
56
- ] = be_memo_pair_(ctx=>
57
- relative(cwd_(ctx), src_path_(ctx)),
58
- { ns: 'app', id: 'src__relative_path' })
68
+ ] = ns_id_be_memo_pair_(
69
+ 'app',
70
+ 'src__relative_path',
71
+ ctx=>
72
+ relative(cwd_(ctx), src_path_(ctx)))
59
73
  export const [
60
74
  app_path$_,
61
75
  app_path_,
62
76
  app_path__set,
63
- ] = be_lock_memosig_triple_(ctx=>
64
- join(src_path_(ctx), 'app'),
65
- { ns: 'app', id: 'app_path' })
77
+ ] = ns_id_be_lock_memosig_triple_(
78
+ 'app',
79
+ 'app_path',
80
+ ctx=>
81
+ join(src_path_(ctx), 'app'))
66
82
  export const [
67
83
  app__relative_path$_,
68
84
  app__relative_path_,
69
- ] = be_memo_pair_(ctx=>
70
- relative(cwd_(ctx), app_path_(ctx)),
71
- { ns: 'app', id: 'app__relative_path' })
85
+ ] = ns_id_be_memo_pair_(
86
+ 'app',
87
+ 'app__relative_path',
88
+ ctx=>relative(cwd_(ctx), app_path_(ctx)))
72
89
  export const [
73
90
  browser__relative_path$_,
74
91
  browser__relative_path_,
75
- ] = be_memo_pair_(ctx=>
76
- join(dist__relative_path_(ctx), is_prod_(ctx) ? 'browser' : 'browser--dev'),
77
- { ns: 'app', is: 'browser_relative_path' })
92
+ ] = ns_id_be_memo_pair_(
93
+ 'app',
94
+ 'browser_relative_path',
95
+ ctx=>
96
+ join(dist__relative_path_(ctx), is_prod_(ctx) ? 'browser' : 'browser--dev'))
78
97
  export const [
79
98
  browser_path$_,
80
99
  browser_path_,
81
- ] = be_memo_pair_(ctx=>
82
- join(cwd_(ctx), browser__relative_path_(ctx)),
83
- { ns: 'app', id: 'browser_path' })
100
+ ] = ns_id_be_memo_pair_(
101
+ 'app',
102
+ 'browser_path',
103
+ ctx=>
104
+ join(cwd_(ctx), browser__relative_path_(ctx)))
84
105
  export const [
85
106
  server__relative_path$_,
86
107
  server__relative_path_,
87
- ] = be_memo_pair_(ctx=>
88
- join(dist__relative_path_(ctx), is_prod_(ctx) ? 'server' : 'server--dev'),
89
- { ns: 'app', id: 'server__relative_path' })
108
+ ] = ns_id_be_memo_pair_(
109
+ 'app',
110
+ 'server__relative_path',
111
+ ctx=>
112
+ join(dist__relative_path_(ctx), is_prod_(ctx) ? 'server' : 'server--dev'))
90
113
  export const [
91
114
  server_path$_,
92
115
  server_path_,
93
- ] = be_memo_pair_(ctx=>
94
- join(cwd_(ctx), server__relative_path_(ctx)),
95
- { ns: 'app', id: 'server_path' })
116
+ ] = ns_id_be_memo_pair_(
117
+ 'app',
118
+ 'server_path',
119
+ ctx=>
120
+ join(cwd_(ctx), server__relative_path_(ctx)))
package/server/app/index.test.ts CHANGED
@@ -54,7 +54,7 @@ test('app_ctx', ()=>{
54
54
  })
55
55
  test('port', ()=>{
56
56
  equal(process.env.PORT, undefined)
57
- equal(port$_(app_ctx)._, 3000)
57
+ equal(port$_(app_ctx)(), 3000)
58
58
  equal(port_(app_ctx), 3000)
59
59
  port__set(app_ctx, 4000)
60
60
  equal(port_(app_ctx), 4000)
@@ -66,10 +66,10 @@ test('port', ()=>{
66
66
  throws(()=>port__set(ctx_(), 5000))
67
67
  })
68
68
  test('cwd', ()=>{
69
- equal(cwd$_(app_ctx)._, resolve('.'))
69
+ equal(cwd$_(app_ctx)(), resolve('.'))
70
70
  equal(cwd_(app_ctx), resolve('.'))
71
71
  cwd__set(app_ctx, '/test/path')
72
- equal(cwd$_(app_ctx)._, resolve('/test/path'))
72
+ equal(cwd$_(app_ctx)(), resolve('/test/path'))
73
73
  equal(cwd_(app_ctx), resolve('/test/path'))
74
74
  // @ts-expect-error TS2345
75
75
  throws(()=>cwd$_(ctx_()))
@@ -80,10 +80,10 @@ test('cwd', ()=>{
80
80
  })
81
81
  test('is_prod', ()=>{
82
82
  not.equal(process.env.NODE_ENV, 'production')
83
- equal(is_prod$_(app_ctx)._, false)
83
+ equal(is_prod$_(app_ctx)(), false)
84
84
  equal(is_prod_(app_ctx), false)
85
85
  is_prod__set(app_ctx, true)
86
- equal(is_prod$_(app_ctx)._, true)
86
+ equal(is_prod$_(app_ctx)(), true)
87
87
  equal(is_prod_(app_ctx), true)
88
88
  // @ts-expect-error TS2345
89
89
  throws(()=>is_prod$_(ctx_()))
@@ -93,16 +93,18 @@ test('is_prod', ()=>{
93
93
  throws(()=>is_prod__set(ctx_(), false))
94
94
  })
95
95
  test('public_path', ()=>{
96
- equal(public_path$_(app_ctx)._, resolve('./public'))
96
+ equal(public_path$_(app_ctx)(), resolve('./public'))
97
97
  equal(public_path_(app_ctx), resolve('./public'))
98
98
  cwd__set(app_ctx, '/test/cwd')
99
- equal(public_path$_(app_ctx)._, '/test/cwd/public')
99
+ // console.debug(app_ctx)
100
+ // console.debug(app_ctx.s.app.get('public_path'))
101
+ equal(public_path$_(app_ctx)(), '/test/cwd/public')
100
102
  equal(public_path_(app_ctx), '/test/cwd/public')
101
103
  public_path__set(app_ctx, '/test/cwd/public2')
102
- equal(public_path$_(app_ctx)._, '/test/cwd/public2')
104
+ equal(public_path$_(app_ctx)(), '/test/cwd/public2')
103
105
  equal(public_path_(app_ctx), '/test/cwd/public2')
104
106
  cwd__set(app_ctx, '/test/cwd2')
105
- equal(public_path$_(app_ctx)._, '/test/cwd/public2')
107
+ equal(public_path$_(app_ctx)(), '/test/cwd/public2')
106
108
  equal(public_path_(app_ctx), '/test/cwd/public2')
107
109
  // @ts-expect-error TS2345
108
110
  throws(()=>public_path$_(ctx_()))
@@ -112,16 +114,16 @@ test('public_path', ()=>{
112
114
  throws(()=>public_path__set(ctx_(), '/another/path/public'))
113
115
  })
114
116
  test('dist_path', ()=>{
115
- equal(dist_path$_(app_ctx)._, resolve('./dist'))
117
+ equal(dist_path$_(app_ctx)(), resolve('./dist'))
116
118
  equal(dist_path_(app_ctx), resolve('./dist'))
117
119
  cwd__set(app_ctx, '/test/cwd')
118
- equal(dist_path$_(app_ctx)._, '/test/cwd/dist')
120
+ equal(dist_path$_(app_ctx)(), '/test/cwd/dist')
119
121
  equal(dist_path_(app_ctx), '/test/cwd/dist')
120
122
  dist_path__set(app_ctx, '/test/cwd/dist2')
121
- equal(dist_path$_(app_ctx)._, '/test/cwd/dist2')
123
+ equal(dist_path$_(app_ctx)(), '/test/cwd/dist2')
122
124
  equal(dist_path_(app_ctx), '/test/cwd/dist2')
123
125
  cwd__set(app_ctx, '/test/cwd2')
124
- equal(dist_path$_(app_ctx)._, '/test/cwd/dist2')
126
+ equal(dist_path$_(app_ctx)(), '/test/cwd/dist2')
125
127
  equal(dist_path_(app_ctx), '/test/cwd/dist2')
126
128
  // @ts-expect-error TS2345
127
129
  throws(()=>dist_path$_(ctx_()))
@@ -131,13 +133,13 @@ test('dist_path', ()=>{
131
133
  throws(()=>dist_path__set(ctx_(), '/another/path/dist'))
132
134
  })
133
135
  test('dist__relative_path', ()=>{
134
- equal(dist__relative_path$_(app_ctx)._, 'dist')
136
+ equal(dist__relative_path$_(app_ctx)(), 'dist')
135
137
  equal(dist__relative_path_(app_ctx), 'dist')
136
138
  cwd__set(app_ctx, '/test/cwd')
137
- equal(dist__relative_path$_(app_ctx)._, 'dist')
139
+ equal(dist__relative_path$_(app_ctx)(), 'dist')
138
140
  equal(dist__relative_path_(app_ctx), 'dist')
139
141
  dist_path__set(app_ctx, '/test/cwd/dist2')
140
- equal(dist__relative_path$_(app_ctx)._, 'dist2')
142
+ equal(dist__relative_path$_(app_ctx)(), 'dist2')
141
143
  equal(dist__relative_path_(app_ctx), 'dist2')
142
144
  // @ts-expect-error TS2345
143
145
  throws(()=>dist__relative_path$_(ctx_()))
@@ -145,16 +147,16 @@ test('dist__relative_path', ()=>{
145
147
  throws(()=>dist__relative_path_(ctx_()))
146
148
  })
147
149
  test('src_path', ()=>{
148
- equal(src_path$_(app_ctx)._, resolve('./src'))
150
+ equal(src_path$_(app_ctx)(), resolve('./src'))
149
151
  equal(src_path_(app_ctx), resolve('./src'))
150
152
  cwd__set(app_ctx, '/test/cwd')
151
- equal(src_path$_(app_ctx)._, '/test/cwd/src')
153
+ equal(src_path$_(app_ctx)(), '/test/cwd/src')
152
154
  equal(src_path_(app_ctx), '/test/cwd/src')
153
155
  src_path__set(app_ctx, '/test/cwd/src2')
154
- equal(src_path$_(app_ctx)._, '/test/cwd/src2')
156
+ equal(src_path$_(app_ctx)(), '/test/cwd/src2')
155
157
  equal(src_path_(app_ctx), '/test/cwd/src2')
156
158
  cwd__set(app_ctx, '/test/cwd2')
157
- equal(src_path$_(app_ctx)._, '/test/cwd/src2')
159
+ equal(src_path$_(app_ctx)(), '/test/cwd/src2')
158
160
  equal(src_path_(app_ctx), '/test/cwd/src2')
159
161
  // @ts-expect-error TS2345
160
162
  throws(()=>src_path$_(ctx_()))
@@ -164,13 +166,13 @@ test('src_path', ()=>{
164
166
  throws(()=>src_path__set(ctx_(), '/another/path/src'))
165
167
  })
166
168
  test('src__relative_path', ()=>{
167
- equal(src__relative_path$_(app_ctx)._, 'src')
169
+ equal(src__relative_path$_(app_ctx)(), 'src')
168
170
  equal(src__relative_path_(app_ctx), 'src')
169
171
  cwd__set(app_ctx, '/test/cwd')
170
- equal(src__relative_path$_(app_ctx)._, 'src')
172
+ equal(src__relative_path$_(app_ctx)(), 'src')
171
173
  equal(src__relative_path_(app_ctx), 'src')
172
174
  src_path__set(app_ctx, '/test/cwd/src2')
173
- equal(src__relative_path$_(app_ctx)._, 'src2')
175
+ equal(src__relative_path$_(app_ctx)(), 'src2')
174
176
  equal(src__relative_path_(app_ctx), 'src2')
175
177
  // @ts-expect-error TS2345
176
178
  throws(()=>src__relative_path$_(ctx_()))
@@ -178,20 +180,20 @@ test('src__relative_path', ()=>{
178
180
  throws(()=>src__relative_path_(ctx_()))
179
181
  })
180
182
  test('app_path', ()=>{
181
- equal(app_path$_(app_ctx)._, resolve('./src/app'))
183
+ equal(app_path$_(app_ctx)(), resolve('./src/app'))
182
184
  equal(app_path_(app_ctx), resolve('./src/app'))
183
185
  cwd__set(app_ctx, '/test/cwd')
184
- equal(app_path$_(app_ctx)._, '/test/cwd/src/app')
186
+ equal(app_path$_(app_ctx)(), '/test/cwd/src/app')
185
187
  equal(app_path_(app_ctx), '/test/cwd/src/app')
186
188
  src_path__set(app_ctx, '/test/cwd/src2')
187
189
  app_path__set(app_ctx, '/test/cwd/src2/app2')
188
- equal(app_path$_(app_ctx)._, '/test/cwd/src2/app2')
190
+ equal(app_path$_(app_ctx)(), '/test/cwd/src2/app2')
189
191
  equal(app_path_(app_ctx), '/test/cwd/src2/app2')
190
192
  cwd__set(app_ctx, '/test/cwd2')
191
- equal(app_path$_(app_ctx)._, '/test/cwd/src2/app2')
193
+ equal(app_path$_(app_ctx)(), '/test/cwd/src2/app2')
192
194
  equal(app_path_(app_ctx), '/test/cwd/src2/app2')
193
195
  src_path__set(app_ctx, '/test/cwd/src3')
194
- equal(app_path$_(app_ctx)._, '/test/cwd/src2/app2')
196
+ equal(app_path$_(app_ctx)(), '/test/cwd/src2/app2')
195
197
  equal(app_path_(app_ctx), '/test/cwd/src2/app2')
196
198
  // @ts-expect-error TS2345
197
199
  throws(()=>app_path$_(ctx_()))
@@ -201,22 +203,22 @@ test('app_path', ()=>{
201
203
  throws(()=>app_path__set(ctx_(), '/another/path/src/app'))
202
204
  })
203
205
  test('app__relative_path', ()=>{
204
- equal(app__relative_path$_(app_ctx)._, 'src/app')
206
+ equal(app__relative_path$_(app_ctx)(), 'src/app')
205
207
  equal(app__relative_path_(app_ctx), 'src/app')
206
208
  cwd__set(app_ctx, '/test/cwd')
207
- equal(app__relative_path$_(app_ctx)._, 'src/app')
209
+ equal(app__relative_path$_(app_ctx)(), 'src/app')
208
210
  equal(app__relative_path_(app_ctx), 'src/app')
209
211
  src_path__set(app_ctx, '/test/cwd/src2')
210
- equal(app__relative_path$_(app_ctx)._, 'src2/app')
212
+ equal(app__relative_path$_(app_ctx)(), 'src2/app')
211
213
  equal(app__relative_path_(app_ctx), 'src2/app')
212
214
  app_path__set(app_ctx, '/test/cwd/src2/app2')
213
- equal(app__relative_path$_(app_ctx)._, 'src2/app2')
215
+ equal(app__relative_path$_(app_ctx)(), 'src2/app2')
214
216
  equal(app__relative_path_(app_ctx), 'src2/app2')
215
217
  cwd__set(app_ctx, '/test/cwd2')
216
- equal(app__relative_path$_(app_ctx)._, '../cwd/src2/app2')
218
+ equal(app__relative_path$_(app_ctx)(), '../cwd/src2/app2')
217
219
  equal(app__relative_path_(app_ctx), '../cwd/src2/app2')
218
220
  src_path__set(app_ctx, '/test/cwd2/src2')
219
- equal(app__relative_path$_(app_ctx)._, '../cwd/src2/app2')
221
+ equal(app__relative_path$_(app_ctx)(), '../cwd/src2/app2')
220
222
  equal(app__relative_path_(app_ctx), '../cwd/src2/app2')
221
223
  // @ts-expect-error TS2345
222
224
  throws(()=>app__relative_path$_(ctx_()))
@@ -225,22 +227,22 @@ test('app__relative_path', ()=>{
225
227
  })
226
228
  test('browser__relative_path', ()=>{
227
229
  is_prod__set(app_ctx, false)
228
- equal(browser__relative_path$_(app_ctx)._, 'dist/browser--dev')
230
+ equal(browser__relative_path$_(app_ctx)(), 'dist/browser--dev')
229
231
  equal(browser__relative_path_(app_ctx), 'dist/browser--dev')
230
232
  is_prod__set(app_ctx, true)
231
- equal(browser__relative_path$_(app_ctx)._, 'dist/browser')
233
+ equal(browser__relative_path$_(app_ctx)(), 'dist/browser')
232
234
  equal(browser__relative_path_(app_ctx), 'dist/browser')
233
235
  cwd__set(app_ctx, '/test/cwd')
234
- equal(browser__relative_path$_(app_ctx)._, 'dist/browser')
236
+ equal(browser__relative_path$_(app_ctx)(), 'dist/browser')
235
237
  equal(browser__relative_path_(app_ctx), 'dist/browser')
236
238
  is_prod__set(app_ctx, false)
237
- equal(browser__relative_path$_(app_ctx)._, 'dist/browser--dev')
239
+ equal(browser__relative_path$_(app_ctx)(), 'dist/browser--dev')
238
240
  equal(browser__relative_path_(app_ctx), 'dist/browser--dev')
239
241
  dist_path__set(app_ctx, '/test/cwd/dist2')
240
- equal(browser__relative_path$_(app_ctx)._, 'dist2/browser--dev')
242
+ equal(browser__relative_path$_(app_ctx)(), 'dist2/browser--dev')
241
243
  equal(browser__relative_path_(app_ctx), 'dist2/browser--dev')
242
244
  is_prod__set(app_ctx, true)
243
- equal(browser__relative_path$_(app_ctx)._, 'dist2/browser')
245
+ equal(browser__relative_path$_(app_ctx)(), 'dist2/browser')
244
246
  equal(browser__relative_path_(app_ctx), 'dist2/browser')
245
247
  // @ts-expect-error TS2345
246
248
  throws(()=>browser__relative_path$_(ctx_()))
@@ -249,22 +251,22 @@ test('browser__relative_path', ()=>{
249
251
  })
250
252
  test('browser_path', ()=>{
251
253
  is_prod__set(app_ctx, false)
252
- equal(browser_path$_(app_ctx)._, resolve('./dist/browser--dev'))
254
+ equal(browser_path$_(app_ctx)(), resolve('./dist/browser--dev'))
253
255
  equal(browser_path_(app_ctx), resolve('./dist/browser--dev'))
254
256
  is_prod__set(app_ctx, true)
255
- equal(browser_path$_(app_ctx)._, resolve('./dist/browser'))
257
+ equal(browser_path$_(app_ctx)(), resolve('./dist/browser'))
256
258
  equal(browser_path_(app_ctx), resolve('./dist/browser'))
257
259
  cwd__set(app_ctx, '/test/cwd')
258
- equal(browser_path$_(app_ctx)._, '/test/cwd/dist/browser')
260
+ equal(browser_path$_(app_ctx)(), '/test/cwd/dist/browser')
259
261
  equal(browser_path_(app_ctx), '/test/cwd/dist/browser')
260
262
  is_prod__set(app_ctx, false)
261
- equal(browser_path$_(app_ctx)._, '/test/cwd/dist/browser--dev')
263
+ equal(browser_path$_(app_ctx)(), '/test/cwd/dist/browser--dev')
262
264
  equal(browser_path_(app_ctx), '/test/cwd/dist/browser--dev')
263
265
  dist_path__set(app_ctx, '/test/cwd/dist2')
264
- equal(browser_path$_(app_ctx)._, '/test/cwd/dist2/browser--dev')
266
+ equal(browser_path$_(app_ctx)(), '/test/cwd/dist2/browser--dev')
265
267
  equal(browser_path_(app_ctx), '/test/cwd/dist2/browser--dev')
266
268
  is_prod__set(app_ctx, true)
267
- equal(browser_path$_(app_ctx)._, '/test/cwd/dist2/browser')
269
+ equal(browser_path$_(app_ctx)(), '/test/cwd/dist2/browser')
268
270
  equal(browser_path_(app_ctx), '/test/cwd/dist2/browser')
269
271
  // @ts-expect-error TS2345
270
272
  throws(()=>browser_path$_(ctx_()))
@@ -273,22 +275,22 @@ test('browser_path', ()=>{
273
275
  })
274
276
  test('server__relative_path', ()=>{
275
277
  is_prod__set(app_ctx, false)
276
- equal(server__relative_path$_(app_ctx)._, 'dist/server--dev')
278
+ equal(server__relative_path$_(app_ctx)(), 'dist/server--dev')
277
279
  equal(server__relative_path_(app_ctx), 'dist/server--dev')
278
280
  is_prod__set(app_ctx, true)
279
- equal(server__relative_path$_(app_ctx)._, 'dist/server')
281
+ equal(server__relative_path$_(app_ctx)(), 'dist/server')
280
282
  equal(server__relative_path_(app_ctx), 'dist/server')
281
283
  cwd__set(app_ctx, '/test/cwd')
282
- equal(server__relative_path$_(app_ctx)._, 'dist/server')
284
+ equal(server__relative_path$_(app_ctx)(), 'dist/server')
283
285
  equal(server__relative_path_(app_ctx), 'dist/server')
284
286
  is_prod__set(app_ctx, false)
285
- equal(server__relative_path$_(app_ctx)._, 'dist/server--dev')
287
+ equal(server__relative_path$_(app_ctx)(), 'dist/server--dev')
286
288
  equal(server__relative_path_(app_ctx), 'dist/server--dev')
287
289
  dist_path__set(app_ctx, '/test/cwd/dist2')
288
- equal(server__relative_path$_(app_ctx)._, 'dist2/server--dev')
290
+ equal(server__relative_path$_(app_ctx)(), 'dist2/server--dev')
289
291
  equal(server__relative_path_(app_ctx), 'dist2/server--dev')
290
292
  is_prod__set(app_ctx, true)
291
- equal(server__relative_path$_(app_ctx)._, 'dist2/server')
293
+ equal(server__relative_path$_(app_ctx)(), 'dist2/server')
292
294
  equal(server__relative_path_(app_ctx), 'dist2/server')
293
295
  // @ts-expect-error TS2345
294
296
  throws(()=>server__relative_path$_(ctx_()))
@@ -297,22 +299,22 @@ test('server__relative_path', ()=>{
297
299
  })
298
300
  test('server_path', ()=>{
299
301
  is_prod__set(app_ctx, false)
300
- equal(server_path$_(app_ctx)._, resolve('./dist/server--dev'))
302
+ equal(server_path$_(app_ctx)(), resolve('./dist/server--dev'))
301
303
  equal(server_path_(app_ctx), resolve('./dist/server--dev'))
302
304
  is_prod__set(app_ctx, true)
303
- equal(server_path$_(app_ctx)._, resolve('./dist/server'))
305
+ equal(server_path$_(app_ctx)(), resolve('./dist/server'))
304
306
  equal(server_path_(app_ctx), resolve('./dist/server'))
305
307
  cwd__set(app_ctx, '/test/cwd')
306
- equal(server_path$_(app_ctx)._, '/test/cwd/dist/server')
308
+ equal(server_path$_(app_ctx)(), '/test/cwd/dist/server')
307
309
  equal(server_path_(app_ctx), '/test/cwd/dist/server')
308
310
  is_prod__set(app_ctx, false)
309
- equal(server_path$_(app_ctx)._, '/test/cwd/dist/server--dev')
311
+ equal(server_path$_(app_ctx)(), '/test/cwd/dist/server--dev')
310
312
  equal(server_path_(app_ctx), '/test/cwd/dist/server--dev')
311
313
  dist_path__set(app_ctx, '/test/cwd/dist2')
312
- equal(server_path$_(app_ctx)._, '/test/cwd/dist2/server--dev')
314
+ equal(server_path$_(app_ctx)(), '/test/cwd/dist2/server--dev')
313
315
  equal(server_path_(app_ctx), '/test/cwd/dist2/server--dev')
314
316
  is_prod__set(app_ctx, true)
315
- equal(server_path$_(app_ctx)._, '/test/cwd/dist2/server')
317
+ equal(server_path$_(app_ctx)(), '/test/cwd/dist2/server')
316
318
  equal(server_path_(app_ctx), '/test/cwd/dist2/server')
317
319
  // @ts-expect-error TS2345
318
320
  throws(()=>server_path$_(ctx_()))
package/server/asset/index.js CHANGED
@@ -1,18 +1,20 @@
1
1
  /// <reference types="./index.d.ts" />
2
2
  import { compact } from 'ctx-core/array'
3
- import { be_lock_memosig_triple_ } from 'ctx-core/rmemo'
3
+ import { ns_id_be_lock_memosig_triple_ } from 'ctx-core/rmemo'
4
4
  import { browser__css_, browser__script_ } from '../rebuildjs_browser/index.js'
5
5
  import { server__css_ } from '../rebuildjs_server/index.js'
6
6
  export const [
7
7
  assets$_,
8
8
  assets_,
9
9
  assets__set,
10
- ] = be_lock_memosig_triple_(ctx=>
11
- assets__new({
12
- css_a: compact([server__css_(ctx), browser__css_(ctx)]),
13
- script_a: compact([browser__script_(ctx)]),
14
- }),
15
- { ns: 'request', id: 'assets' })
10
+ ] = ns_id_be_lock_memosig_triple_(
11
+ 'request',
12
+ 'assets',
13
+ ctx=>
14
+ assets__new({
15
+ css_a: compact([server__css_(ctx), browser__css_(ctx)]),
16
+ script_a: compact([browser__script_(ctx)]),
17
+ }))
16
18
  export function assets__assign(request_ctx, ..._assets_a) {
17
19
  assets__set(request_ctx, assets__new(assets_(request_ctx), ..._assets_a))
18
20
  }