@simplysm/sd-cli 13.0.76 → 13.0.77

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 (154) hide show
  1. package/README.md +341 -16
  2. package/dist/builders/DtsBuilder.js +2 -2
  3. package/dist/builders/DtsBuilder.js.map +1 -1
  4. package/dist/builders/LibraryBuilder.d.ts +3 -3
  5. package/dist/builders/LibraryBuilder.d.ts.map +1 -1
  6. package/dist/builders/LibraryBuilder.js +2 -2
  7. package/dist/builders/LibraryBuilder.js.map +1 -1
  8. package/dist/builders/types.d.ts +7 -1
  9. package/dist/builders/types.d.ts.map +1 -1
  10. package/dist/capacitor/capacitor.d.ts +5 -0
  11. package/dist/capacitor/capacitor.d.ts.map +1 -1
  12. package/dist/capacitor/capacitor.js +59 -59
  13. package/dist/capacitor/capacitor.js.map +1 -1
  14. package/dist/commands/check.js +4 -4
  15. package/dist/commands/check.js.map +1 -1
  16. package/dist/commands/device.js +3 -3
  17. package/dist/commands/device.js.map +1 -1
  18. package/dist/commands/lint.js +4 -4
  19. package/dist/commands/lint.js.map +1 -1
  20. package/dist/commands/publish.js +20 -20
  21. package/dist/commands/publish.js.map +1 -1
  22. package/dist/commands/replace-deps.js +1 -1
  23. package/dist/commands/replace-deps.js.map +1 -1
  24. package/dist/commands/typecheck.js +9 -9
  25. package/dist/commands/typecheck.js.map +1 -1
  26. package/dist/electron/electron.js +16 -16
  27. package/dist/electron/electron.js.map +1 -1
  28. package/dist/orchestrators/BuildOrchestrator.js +6 -6
  29. package/dist/orchestrators/BuildOrchestrator.js.map +1 -1
  30. package/dist/orchestrators/DevOrchestrator.d.ts +7 -6
  31. package/dist/orchestrators/DevOrchestrator.d.ts.map +1 -1
  32. package/dist/orchestrators/DevOrchestrator.js +157 -203
  33. package/dist/orchestrators/DevOrchestrator.js.map +1 -1
  34. package/dist/orchestrators/WatchOrchestrator.d.ts.map +1 -1
  35. package/dist/orchestrators/WatchOrchestrator.js +3 -4
  36. package/dist/orchestrators/WatchOrchestrator.js.map +1 -1
  37. package/dist/sd-cli.js +1 -1
  38. package/dist/sd-cli.js.map +1 -1
  39. package/dist/sd-config.types.d.ts +9 -3
  40. package/dist/sd-config.types.d.ts.map +1 -1
  41. package/dist/utils/copy-public.d.ts.map +1 -1
  42. package/dist/utils/copy-public.js +23 -27
  43. package/dist/utils/copy-public.js.map +1 -1
  44. package/dist/utils/copy-src.d.ts.map +1 -1
  45. package/dist/utils/copy-src.js +7 -7
  46. package/dist/utils/copy-src.js.map +1 -1
  47. package/dist/utils/esbuild-config.d.ts.map +1 -1
  48. package/dist/utils/esbuild-config.js +36 -42
  49. package/dist/utils/esbuild-config.js.map +1 -1
  50. package/dist/utils/replace-deps.js +7 -7
  51. package/dist/utils/replace-deps.js.map +1 -1
  52. package/dist/utils/sd-config.js +2 -2
  53. package/dist/utils/sd-config.js.map +1 -1
  54. package/dist/utils/template.js +7 -7
  55. package/dist/utils/template.js.map +1 -1
  56. package/dist/utils/tsconfig.d.ts +1 -2
  57. package/dist/utils/tsconfig.d.ts.map +1 -1
  58. package/dist/utils/tsconfig.js +5 -8
  59. package/dist/utils/tsconfig.js.map +1 -1
  60. package/dist/utils/typecheck-serialization.js +2 -2
  61. package/dist/utils/typecheck-serialization.js.map +1 -1
  62. package/dist/utils/vite-config.d.ts +2 -0
  63. package/dist/utils/vite-config.d.ts.map +1 -1
  64. package/dist/utils/vite-config.js +36 -3
  65. package/dist/utils/vite-config.js.map +1 -1
  66. package/dist/utils/worker-events.d.ts +11 -1
  67. package/dist/utils/worker-events.d.ts.map +1 -1
  68. package/dist/utils/worker-events.js +3 -5
  69. package/dist/utils/worker-events.js.map +1 -1
  70. package/dist/utils/worker-utils.d.ts +2 -2
  71. package/dist/utils/worker-utils.d.ts.map +1 -1
  72. package/dist/utils/worker-utils.js +1 -1
  73. package/dist/utils/worker-utils.js.map +1 -1
  74. package/dist/workers/client.worker.d.ts +1 -1
  75. package/dist/workers/client.worker.js +3 -3
  76. package/dist/workers/client.worker.js.map +1 -1
  77. package/dist/workers/dts.worker.d.ts +1 -1
  78. package/dist/workers/dts.worker.d.ts.map +1 -1
  79. package/dist/workers/dts.worker.js +13 -28
  80. package/dist/workers/dts.worker.js.map +1 -1
  81. package/dist/workers/library.worker.d.ts +1 -1
  82. package/dist/workers/library.worker.js +4 -4
  83. package/dist/workers/library.worker.js.map +1 -1
  84. package/dist/workers/lint.worker.d.ts +1 -1
  85. package/dist/workers/server-runtime.worker.d.ts +1 -1
  86. package/dist/workers/server-runtime.worker.js +4 -4
  87. package/dist/workers/server-runtime.worker.js.map +1 -1
  88. package/dist/workers/server.worker.d.ts +1 -1
  89. package/dist/workers/server.worker.js +6 -6
  90. package/dist/workers/server.worker.js.map +1 -1
  91. package/package.json +4 -4
  92. package/src/builders/DtsBuilder.ts +2 -2
  93. package/src/builders/LibraryBuilder.ts +7 -10
  94. package/src/builders/types.ts +6 -1
  95. package/src/capacitor/capacitor.ts +61 -60
  96. package/src/commands/check.ts +4 -4
  97. package/src/commands/device.ts +3 -3
  98. package/src/commands/lint.ts +4 -4
  99. package/src/commands/publish.ts +20 -20
  100. package/src/commands/replace-deps.ts +1 -1
  101. package/src/commands/typecheck.ts +9 -9
  102. package/src/electron/electron.ts +16 -16
  103. package/src/orchestrators/BuildOrchestrator.ts +6 -6
  104. package/src/orchestrators/DevOrchestrator.ts +210 -256
  105. package/src/orchestrators/WatchOrchestrator.ts +8 -10
  106. package/src/sd-cli.ts +1 -1
  107. package/src/sd-config.types.ts +10 -3
  108. package/src/utils/copy-public.ts +22 -26
  109. package/src/utils/copy-src.ts +7 -7
  110. package/src/utils/esbuild-config.ts +51 -63
  111. package/src/utils/replace-deps.ts +7 -7
  112. package/src/utils/sd-config.ts +2 -2
  113. package/src/utils/template.ts +7 -7
  114. package/src/utils/tsconfig.ts +6 -10
  115. package/src/utils/typecheck-serialization.ts +2 -2
  116. package/src/utils/vite-config.ts +376 -341
  117. package/src/utils/worker-events.ts +13 -10
  118. package/src/utils/worker-utils.ts +45 -45
  119. package/src/workers/client.worker.ts +3 -3
  120. package/src/workers/dts.worker.ts +451 -467
  121. package/src/workers/library.worker.ts +4 -4
  122. package/src/workers/server-runtime.worker.ts +4 -4
  123. package/src/workers/server.worker.ts +572 -572
  124. package/templates/init/package.json.hbs +2 -2
  125. package/templates/init/packages/client-admin/package.json.hbs +5 -5
  126. package/templates/init/packages/client-admin/src/views/auth/LoginView.tsx +2 -2
  127. package/templates/init/packages/client-admin/src/views/home/base/employee/EmployeeSheet.tsx.hbs +1 -1
  128. package/templates/init/packages/client-admin/src/views/home/base/role-permission/RoleSheet.tsx.hbs +1 -1
  129. package/templates/init/packages/db-main/package.json.hbs +2 -2
  130. package/templates/init/packages/server/package.json.hbs +4 -4
  131. package/templates/init/tests/e2e/package.json.hbs +1 -1
  132. package/tests/get-compiler-options-for-package.spec.ts +13 -27
  133. package/tests/get-types-from-package-json.spec.ts +15 -11
  134. package/tests/load-ignore-patterns.spec.ts +15 -11
  135. package/tests/load-sd-config.spec.ts +16 -14
  136. package/tests/publish-config-narrowing.spec.ts +20 -0
  137. package/tests/run-lint.spec.ts +38 -34
  138. package/tests/run-typecheck.spec.ts +194 -135
  139. package/tests/sd-public-dev-plugin-mime.spec.ts +19 -0
  140. package/dist/builders/index.d.ts +0 -5
  141. package/dist/builders/index.d.ts.map +0 -1
  142. package/dist/builders/index.js +0 -5
  143. package/dist/builders/index.js.map +0 -6
  144. package/dist/infra/index.d.ts +0 -4
  145. package/dist/infra/index.d.ts.map +0 -1
  146. package/dist/infra/index.js +0 -4
  147. package/dist/infra/index.js.map +0 -6
  148. package/dist/orchestrators/index.d.ts +0 -4
  149. package/dist/orchestrators/index.d.ts.map +0 -1
  150. package/dist/orchestrators/index.js +0 -4
  151. package/dist/orchestrators/index.js.map +0 -6
  152. package/src/builders/index.ts +0 -4
  153. package/src/infra/index.ts +0 -3
  154. package/src/orchestrators/index.ts +0 -3
@@ -1,6 +1,6 @@
1
1
  import path from "path";
2
2
  import { Worker } from "@simplysm/core-node";
3
- import { errorMessage } from "@simplysm/core-common";
3
+ import { err as errNs } from "@simplysm/core-common";
4
4
  import { consola } from "consola";
5
5
  import { loadSdConfig } from "../utils/sd-config.js";
6
6
  import { getVersion } from "../utils/build-env.js";
@@ -65,7 +65,7 @@ class DevOrchestrator {
65
65
  this._sdConfig = await loadSdConfig({
66
66
  cwd: this._cwd,
67
67
  dev: true,
68
- opt: this._options.options
68
+ options: this._options.options
69
69
  });
70
70
  this._logger.debug("sd.config.ts loaded successfully");
71
71
  } catch (err) {
@@ -137,8 +137,47 @@ class DevOrchestrator {
137
137
  isInitialBuild: true,
138
138
  buildResolver: void 0
139
139
  }));
140
- const standaloneClientPromises = this._setupStandaloneClients();
141
- const { buildPromises: viteClientPromises, readyPromises: viteClientReadyPromises } = this._setupViteClients();
140
+ const standaloneClientPromises = this._setupClientWorkers({
141
+ workers: this._standaloneClientWorkers,
142
+ createConfig: (workerInfo) => ({
143
+ ...workerInfo.config,
144
+ env: { ...this._baseEnv, ...workerInfo.config.env }
145
+ })
146
+ });
147
+ const viteClientReadyPromises = /* @__PURE__ */ new Map();
148
+ for (const workerInfo of this._viteClientWorkers) {
149
+ let readyResolver;
150
+ const readyPromise = new Promise((resolve) => {
151
+ readyResolver = resolve;
152
+ });
153
+ viteClientReadyPromises.set(workerInfo.name, {
154
+ promise: readyPromise,
155
+ resolver: readyResolver
156
+ });
157
+ }
158
+ const viteClientPromises = this._setupClientWorkers({
159
+ workers: this._viteClientWorkers,
160
+ onServerReady: (workerInfo, port, completeTask) => {
161
+ this._logger.debug(`[${workerInfo.name}] Vite serverReady (port: ${String(port)})`);
162
+ this._clientPorts[workerInfo.name] = port;
163
+ viteClientReadyPromises.get(workerInfo.name)?.resolver();
164
+ completeTask({
165
+ name: workerInfo.name,
166
+ target: workerInfo.config.target,
167
+ type: "build",
168
+ status: "success"
169
+ });
170
+ },
171
+ onError: (workerInfo) => {
172
+ viteClientReadyPromises.get(workerInfo.name)?.resolver();
173
+ },
174
+ createConfig: (workerInfo) => ({
175
+ ...workerInfo.config,
176
+ server: 0,
177
+ // Vite will automatically assign port
178
+ env: { ...this._baseEnv, ...workerInfo.config.env }
179
+ })
180
+ });
142
181
  const serverPromises = this._setupServers(
143
182
  serverWorkerPath,
144
183
  serverRuntimeWorkerPath,
@@ -188,7 +227,7 @@ class DevOrchestrator {
188
227
  target: "client",
189
228
  type: "capacitor",
190
229
  status: "error",
191
- message: errorMessage(err)
230
+ message: errNs.message(err)
192
231
  });
193
232
  this._logger.fail(taskName);
194
233
  }
@@ -198,11 +237,11 @@ class DevOrchestrator {
198
237
  printServers(this._results, this._serverClientsMap);
199
238
  }
200
239
  /**
201
- * Setup and start standalone client workers
240
+ * Setup and start client workers (unified for standalone and server-connected clients)
202
241
  */
203
- _setupStandaloneClients() {
242
+ _setupClientWorkers(opts) {
204
243
  const buildPromises = /* @__PURE__ */ new Map();
205
- for (const workerInfo of this._standaloneClientWorkers) {
244
+ for (const workerInfo of opts.workers) {
206
245
  buildPromises.set(
207
246
  workerInfo.name,
208
247
  new Promise((resolve) => {
@@ -210,7 +249,7 @@ class DevOrchestrator {
210
249
  })
211
250
  );
212
251
  }
213
- for (const workerInfo of this._standaloneClientWorkers) {
252
+ for (const workerInfo of opts.workers) {
214
253
  const completeTask = registerWorkerEventHandlers(
215
254
  workerInfo,
216
255
  {
@@ -223,22 +262,28 @@ class DevOrchestrator {
223
262
  );
224
263
  workerInfo.worker.on("serverReady", (data) => {
225
264
  const event = data;
226
- completeTask({
227
- name: workerInfo.name,
228
- target: workerInfo.config.target,
229
- type: "server",
230
- status: "running",
231
- port: event.port
232
- });
265
+ if (opts.onServerReady != null) {
266
+ opts.onServerReady(workerInfo, event.port, completeTask);
267
+ } else {
268
+ completeTask({
269
+ name: workerInfo.name,
270
+ target: workerInfo.config.target,
271
+ type: "server",
272
+ status: "running",
273
+ port: event.port
274
+ });
275
+ }
233
276
  });
277
+ if (opts.onError != null) {
278
+ workerInfo.worker.on("error", () => {
279
+ opts.onError(workerInfo);
280
+ });
281
+ }
234
282
  workerInfo.worker.on("scopeRebuild", () => {
235
283
  this._schedulePrintServers();
236
284
  });
237
285
  const pkgDir = path.join(this._cwd, "packages", workerInfo.name);
238
- const clientConfig = {
239
- ...workerInfo.config,
240
- env: { ...this._baseEnv, ...workerInfo.config.env }
241
- };
286
+ const clientConfig = opts.createConfig(workerInfo);
242
287
  workerInfo.worker.startWatch({
243
288
  name: workerInfo.name,
244
289
  config: clientConfig,
@@ -251,97 +296,15 @@ class DevOrchestrator {
251
296
  target: workerInfo.config.target,
252
297
  type: "build",
253
298
  status: "error",
254
- message: errorMessage(err)
299
+ message: errNs.message(err)
255
300
  });
256
301
  });
257
302
  }
258
- return this._standaloneClientWorkers.map((workerInfo) => ({
303
+ return opts.workers.map((workerInfo) => ({
259
304
  name: `${workerInfo.name} (client)`,
260
305
  promise: buildPromises.get(workerInfo.name) ?? Promise.resolve()
261
306
  }));
262
307
  }
263
- /**
264
- * Setup and start Vite client (server-connected) workers
265
- */
266
- _setupViteClients() {
267
- const buildPromiseMap = /* @__PURE__ */ new Map();
268
- const readyPromises = /* @__PURE__ */ new Map();
269
- for (const workerInfo of this._viteClientWorkers) {
270
- buildPromiseMap.set(
271
- workerInfo.name,
272
- new Promise((resolve) => {
273
- workerInfo.buildResolver = resolve;
274
- })
275
- );
276
- let readyResolver;
277
- const readyPromise = new Promise((resolve) => {
278
- readyResolver = resolve;
279
- });
280
- readyPromises.set(workerInfo.name, {
281
- promise: readyPromise,
282
- resolver: readyResolver
283
- });
284
- }
285
- for (const workerInfo of this._viteClientWorkers) {
286
- const completeTask = registerWorkerEventHandlers(
287
- workerInfo,
288
- {
289
- resultKey: `${workerInfo.name}:build`,
290
- listrTitle: `${workerInfo.name} (client)`,
291
- resultType: "build"
292
- },
293
- this._results,
294
- this._rebuildManager
295
- );
296
- workerInfo.worker.on("serverReady", (data) => {
297
- const event = data;
298
- this._logger.debug(`[${workerInfo.name}] Vite serverReady (port: ${String(event.port)})`);
299
- this._clientPorts[workerInfo.name] = event.port;
300
- readyPromises.get(workerInfo.name)?.resolver();
301
- completeTask({
302
- name: workerInfo.name,
303
- target: workerInfo.config.target,
304
- type: "build",
305
- status: "success"
306
- });
307
- });
308
- workerInfo.worker.on("error", () => {
309
- readyPromises.get(workerInfo.name)?.resolver();
310
- });
311
- workerInfo.worker.on("scopeRebuild", () => {
312
- this._schedulePrintServers();
313
- });
314
- const pkgDir = path.join(this._cwd, "packages", workerInfo.name);
315
- const viteConfig = {
316
- ...workerInfo.config,
317
- server: 0,
318
- // Vite will automatically assign port
319
- env: { ...this._baseEnv, ...workerInfo.config.env }
320
- };
321
- workerInfo.worker.startWatch({
322
- name: workerInfo.name,
323
- config: viteConfig,
324
- cwd: this._cwd,
325
- pkgDir,
326
- replaceDeps: this._sdConfig.replaceDeps
327
- }).catch((err) => {
328
- completeTask({
329
- name: workerInfo.name,
330
- target: workerInfo.config.target,
331
- type: "build",
332
- status: "error",
333
- message: errorMessage(err)
334
- });
335
- });
336
- }
337
- return {
338
- buildPromises: this._viteClientWorkers.map((workerInfo) => ({
339
- name: `${workerInfo.name} (client)`,
340
- promise: buildPromiseMap.get(workerInfo.name) ?? Promise.resolve()
341
- })),
342
- readyPromises
343
- };
344
- }
345
308
  /**
346
309
  * Setup and start Server Build/Runtime workers
347
310
  */
@@ -365,11 +328,22 @@ class DevOrchestrator {
365
328
  });
366
329
  serverRuntimePromises.set(name, { promise, resolver });
367
330
  }
331
+ const isFirstBuild = new Map(
332
+ this._serverPackages.map(({ name }) => [name, true])
333
+ );
334
+ const resolveServerStep = (serverName, resultKey, result) => {
335
+ this._results.set(resultKey, result);
336
+ if (isFirstBuild.get(serverName)) {
337
+ isFirstBuild.set(serverName, false);
338
+ serverRuntimePromises.get(serverName)?.resolver();
339
+ }
340
+ const updatedBuild = this._serverBuildWorkers.get(serverName);
341
+ updatedBuild.buildResolver();
342
+ };
368
343
  for (const { name } of this._serverPackages) {
369
344
  const serverBuild = this._serverBuildWorkers.get(name);
370
- let isFirstBuild = true;
371
345
  serverBuild.worker.on("buildStart", () => {
372
- if (!isFirstBuild) {
346
+ if (!isFirstBuild.get(name)) {
373
347
  const resolver = this._rebuildManager.registerBuild(`${name}:server`, `${name} (server)`);
374
348
  this._serverBuildWorkers.set(name, {
375
349
  ...serverBuild,
@@ -384,127 +358,43 @@ class DevOrchestrator {
384
358
  this._logger.warn(formatBuildMessages(name, "server", event.warnings));
385
359
  }
386
360
  if (!event.success) {
387
- this._results.set(`${name}:build`, {
361
+ resolveServerStep(name, `${name}:build`, {
388
362
  name,
389
363
  target: "server",
390
364
  type: "build",
391
365
  status: "error",
392
366
  message: event.errors?.join("\n")
393
367
  });
394
- if (isFirstBuild) {
395
- isFirstBuild = false;
396
- serverRuntimePromises.get(name)?.resolver();
397
- }
398
- this._serverBuildWorkers.get(name).buildResolver();
399
368
  return;
400
369
  }
401
- void startServerRuntime(name, event.mainJsPath).catch((err) => {
402
- const message = errorMessage(err);
370
+ void this._startServerRuntime(
371
+ name,
372
+ event.mainJsPath,
373
+ serverRuntimeWorkerPath,
374
+ serverRuntimePromises,
375
+ resolveServerStep,
376
+ viteClientReadyPromises
377
+ ).catch((err) => {
378
+ const message = errNs.message(err);
403
379
  this._logger.error(`[${name}] Error starting Server Runtime:`, message);
404
- this._results.set(`${name}:server`, {
380
+ resolveServerStep(name, `${name}:server`, {
405
381
  name,
406
382
  target: "server",
407
383
  type: "server",
408
384
  status: "error",
409
385
  message
410
386
  });
411
- if (isFirstBuild) {
412
- isFirstBuild = false;
413
- serverRuntimePromises.get(name)?.resolver();
414
- }
415
- const updatedBuild = this._serverBuildWorkers.get(name);
416
- updatedBuild.buildResolver();
417
387
  });
418
388
  });
419
- const startServerRuntime = async (serverName, mainJsPath) => {
420
- this._logger.debug(`[${serverName}] startServerRuntime: ${mainJsPath}`);
421
- const updatedBuild = this._serverBuildWorkers.get(serverName);
422
- updatedBuild.mainJsPath = mainJsPath;
423
- const existingRuntime = this._serverRuntimeWorkers.get(serverName);
424
- if (existingRuntime != null) {
425
- this._logger.info(`[${serverName}] Restarting server...`);
426
- await existingRuntime.terminate();
427
- }
428
- const runtimeWorker = Worker.create(serverRuntimeWorkerPath);
429
- this._serverRuntimeWorkers.set(serverName, runtimeWorker);
430
- const connectedClients = this._serverClientsMap.get(serverName) ?? [];
431
- const clientReadyPromises = connectedClients.map((clientName) => viteClientReadyPromises.get(clientName)?.promise).filter((p) => p != null);
432
- this._logger.debug(
433
- `[${serverName}] Waiting for clients: ${String(clientReadyPromises.length)} total`
434
- );
435
- if (clientReadyPromises.length > 0) {
436
- await Promise.all(clientReadyPromises);
437
- }
438
- const serverClientPorts = {};
439
- for (const clientName of connectedClients) {
440
- if (clientName in this._clientPorts) {
441
- serverClientPorts[clientName] = this._clientPorts[clientName];
442
- }
443
- }
444
- runtimeWorker.on("serverReady", (readyData) => {
445
- const readyEvent = readyData;
446
- this._results.set(`${serverName}:server`, {
447
- name: serverName,
448
- target: "server",
449
- type: "server",
450
- status: "running",
451
- port: readyEvent.port
452
- });
453
- if (isFirstBuild) {
454
- isFirstBuild = false;
455
- serverRuntimePromises.get(serverName)?.resolver();
456
- }
457
- updatedBuild.buildResolver();
458
- });
459
- runtimeWorker.on("error", (errorData) => {
460
- const errorEvent = errorData;
461
- this._results.set(`${serverName}:server`, {
462
- name: serverName,
463
- target: "server",
464
- type: "server",
465
- status: "error",
466
- message: errorEvent.message
467
- });
468
- if (isFirstBuild) {
469
- isFirstBuild = false;
470
- serverRuntimePromises.get(serverName)?.resolver();
471
- }
472
- updatedBuild.buildResolver();
473
- });
474
- runtimeWorker.start({
475
- mainJsPath,
476
- clientPorts: serverClientPorts
477
- }).catch((err) => {
478
- const message = errorMessage(err);
479
- this._logger.error(`[${serverName}] Server Runtime Worker crashed:`, message);
480
- this._results.set(`${serverName}:server`, {
481
- name: serverName,
482
- target: "server",
483
- type: "server",
484
- status: "error",
485
- message
486
- });
487
- if (isFirstBuild) {
488
- isFirstBuild = false;
489
- serverRuntimePromises.get(serverName)?.resolver();
490
- }
491
- updatedBuild.buildResolver();
492
- });
493
- };
494
389
  serverBuild.worker.on("error", (data) => {
495
390
  const event = data;
496
- this._results.set(`${name}:build`, {
391
+ resolveServerStep(name, `${name}:build`, {
497
392
  name,
498
393
  target: "server",
499
394
  type: "build",
500
395
  status: "error",
501
396
  message: event.message
502
397
  });
503
- if (isFirstBuild) {
504
- isFirstBuild = false;
505
- serverRuntimePromises.get(name)?.resolver();
506
- }
507
- this._serverBuildWorkers.get(name).buildResolver();
508
398
  });
509
399
  }
510
400
  for (const { name, config } of this._serverPackages) {
@@ -524,7 +414,7 @@ class DevOrchestrator {
524
414
  target: "server",
525
415
  type: "build",
526
416
  status: "error",
527
- message: errorMessage(err)
417
+ message: errNs.message(err)
528
418
  });
529
419
  serverRuntimePromises.get(name)?.resolver();
530
420
  serverBuild.buildResolver();
@@ -535,6 +425,70 @@ class DevOrchestrator {
535
425
  promise: serverRuntimePromises.get(name)?.promise ?? Promise.resolve()
536
426
  }));
537
427
  }
428
+ /**
429
+ * Start server runtime worker.
430
+ * Separated as a dedicated method to catch errors from async event handlers.
431
+ */
432
+ async _startServerRuntime(serverName, mainJsPath, serverRuntimeWorkerPath, serverRuntimePromises, resolveServerStep, viteClientReadyPromises) {
433
+ this._logger.debug(`[${serverName}] _startServerRuntime: ${mainJsPath}`);
434
+ const updatedBuild = this._serverBuildWorkers.get(serverName);
435
+ updatedBuild.mainJsPath = mainJsPath;
436
+ const existingRuntime = this._serverRuntimeWorkers.get(serverName);
437
+ if (existingRuntime != null) {
438
+ this._logger.info(`[${serverName}] Restarting server...`);
439
+ await existingRuntime.terminate();
440
+ }
441
+ const runtimeWorker = Worker.create(serverRuntimeWorkerPath);
442
+ this._serverRuntimeWorkers.set(serverName, runtimeWorker);
443
+ const connectedClients = this._serverClientsMap.get(serverName) ?? [];
444
+ const clientReadyPromises = connectedClients.map((clientName) => viteClientReadyPromises.get(clientName)?.promise).filter((p) => p != null);
445
+ this._logger.debug(
446
+ `[${serverName}] Waiting for clients: ${String(clientReadyPromises.length)} total`
447
+ );
448
+ if (clientReadyPromises.length > 0) {
449
+ await Promise.all(clientReadyPromises);
450
+ }
451
+ const serverClientPorts = {};
452
+ for (const clientName of connectedClients) {
453
+ if (clientName in this._clientPorts) {
454
+ serverClientPorts[clientName] = this._clientPorts[clientName];
455
+ }
456
+ }
457
+ runtimeWorker.on("serverReady", (readyData) => {
458
+ const readyEvent = readyData;
459
+ resolveServerStep(serverName, `${serverName}:server`, {
460
+ name: serverName,
461
+ target: "server",
462
+ type: "server",
463
+ status: "running",
464
+ port: readyEvent.port
465
+ });
466
+ });
467
+ runtimeWorker.on("error", (errorData) => {
468
+ const errorEvent = errorData;
469
+ resolveServerStep(serverName, `${serverName}:server`, {
470
+ name: serverName,
471
+ target: "server",
472
+ type: "server",
473
+ status: "error",
474
+ message: errorEvent.message
475
+ });
476
+ });
477
+ runtimeWorker.start({
478
+ mainJsPath,
479
+ clientPorts: serverClientPorts
480
+ }).catch((err) => {
481
+ const message = errNs.message(err);
482
+ this._logger.error(`[${serverName}] Server Runtime Worker crashed:`, message);
483
+ resolveServerStep(serverName, `${serverName}:server`, {
484
+ name: serverName,
485
+ target: "server",
486
+ type: "server",
487
+ status: "error",
488
+ message
489
+ });
490
+ });
491
+ }
538
492
  /**
539
493
  * Wait for termination signal
540
494
  */
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/orchestrators/DevOrchestrator.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
@@ -1 +1 @@
1
- {"version":3,"file":"WatchOrchestrator.d.ts","sourceRoot":"","sources":["..\\..\\src\\orchestrators\\WatchOrchestrator.ts"],"names":[],"mappings":"AAiBA;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;;;;GAMG;AACH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA2B;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmC;IAE3D,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,kBAAkB,CAAoC;gBAElD,OAAO,EAAE,wBAAwB;IAK7C;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA0EjC;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAuD5B;;OAEG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOvC;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAiBhC"}
1
+ {"version":3,"file":"WatchOrchestrator.d.ts","sourceRoot":"","sources":["..\\..\\src\\orchestrators\\WatchOrchestrator.ts"],"names":[],"mappings":"AAgBA;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;;;;GAMG;AACH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA2B;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmC;IAE3D,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,kBAAkB,CAAoC;gBAElD,OAAO,EAAE,wBAAwB;IAK7C;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA0EjC;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAsD5B;;OAEG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOvC;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAiBhC"}
@@ -39,7 +39,7 @@ class WatchOrchestrator {
39
39
  sdConfig = await loadSdConfig({
40
40
  cwd: this._cwd,
41
41
  dev: true,
42
- opt: this._options.options
42
+ options: this._options.options
43
43
  });
44
44
  this._logger.debug("sd.config.ts loaded");
45
45
  } catch (err) {
@@ -95,9 +95,8 @@ class WatchOrchestrator {
95
95
  const buildPromises = this._libraryBuilder.getInitialBuildPromises();
96
96
  const dtsPromises = this._dtsBuilder.getInitialBuildPromises();
97
97
  for (const pkg of this._packages) {
98
- const buildConfig = pkg.config;
99
- if (buildConfig.copySrc != null && buildConfig.copySrc.length > 0) {
100
- const watcher = await watchCopySrcFiles(pkg.dir, buildConfig.copySrc);
98
+ if (pkg.config.copySrc != null && pkg.config.copySrc.length > 0) {
99
+ const watcher = await watchCopySrcFiles(pkg.dir, pkg.config.copySrc);
101
100
  this._copySrcWatchers.push(watcher);
102
101
  }
103
102
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/orchestrators/WatchOrchestrator.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
package/dist/sd-cli.js CHANGED
@@ -14,7 +14,7 @@ if (isDev) {
14
14
  try {
15
15
  const { loadSdConfig } = await import("./utils/sd-config.js");
16
16
  const { setupReplaceDeps } = await import("./utils/replace-deps.js");
17
- const sdConfig = await loadSdConfig({ cwd: process.cwd(), dev: false, opt: [] });
17
+ const sdConfig = await loadSdConfig({ cwd: process.cwd(), dev: false, options: [] });
18
18
  if (sdConfig.replaceDeps != null) {
19
19
  await setupReplaceDeps(process.cwd(), sdConfig.replaceDeps);
20
20
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/sd-cli.ts"],
4
- "mappings": ";AASA,SAAS,aAAa;AACtB,OAAO,QAAQ;AACf,OAAO,UAAU;AACjB,SAAS,qBAAqB;AAE9B,MAAM,aAAa,cAAc,YAAY,GAAG;AAChD,MAAM,YAAY,KAAK,QAAQ,UAAU;AACzC,MAAM,QAAQ,KAAK,QAAQ,UAAU,MAAM;AAE3C,IAAI,OAAO;AAIT,+BAA6B,QAAQ,GAAG;AACxC,QAAM,EAAE,gBAAgB,IAAI,MAAM,OAAO,mBAAmB;AAC5D,QAAM,gBAAgB,QAAQ,KAAK,MAAM,CAAC,CAAC,EAAE,MAAM;AACrD,OAAO;AAIL,MAAI;AACF,UAAM,EAAE,aAAa,IAAI,MAAM,OAAO,sBAAsB;AAC5D,UAAM,EAAE,iBAAiB,IAAI,MAAM,OAAO,yBAAyB;AACnE,UAAM,WAAW,MAAM,aAAa,EAAE,KAAK,QAAQ,IAAI,GAAG,KAAK,OAAO,KAAK,CAAC,EAAE,CAAC;AAC/E,QAAI,SAAS,eAAe,MAAM;AAChC,YAAM,iBAAiB,QAAQ,IAAI,GAAG,SAAS,WAAW;AAAA,IAC5D;AAAA,EACF,QAAQ;AAAA,EAER;AAGA,QAAM,mBAAmB,KAAK,KAAK,WAAW,iBAAiB;AAC/D,QAAM,aAAa;AAAA,IACjB;AAAA,IACA;AAAA,MACE;AAAA,MACA;AAAA,MACA;AAAA,MACA,GAAG,QAAQ,KAAK,MAAM,CAAC;AAAA,IACzB;AAAA,IACA,EAAE,OAAO,WAAW,QAAQ,MAAM;AAAA,EACpC;AACA,MAAI,WAAW,OAAO,KAAM,8BAA6B,WAAW,GAAG;AACvE,QAAM,SAAS,MAAM;AACrB,UAAQ,WAAW,OAAO,YAAY;AACxC;AAQA,SAAS,sBAAsB,UAA0B;AACvD,QAAM,UAAU,YAAY,IAAI,IAAI,KAAK,KAAK,WAAW,CAAC;AAC1D,MAAI,OAAO;AACX,WAAS,IAAI,SAAS,IAAI,UAAU,KAAK;AACvC,YAAQ,MAAM,OAAO,CAAC;AAAA,EACxB;AACA,SAAO,OAAO,KAAK,SAAS,EAAE,EAAE,YAAY;AAC9C;AAUA,SAAS,6BAA6B,KAAmB;AACvD,QAAM,WAAW,GAAG,KAAK,EAAE;AAC3B,QAAM,OAAO,sBAAsB,QAAQ;AAE3C,MAAI;AACJ,MAAI,QAAQ,aAAa,SAAS;AAChC,UAAM,WAAW;AAAA,MACf,wBAAwB,GAAG;AAAA,MAC3B,0BAA0B,IAAI;AAAA,MAC9B;AAAA,IACF,EAAE,KAAK,IAAI;AACX,cAAU,wBAAwB,QAAQ;AAAA,EAC5C,OAAO;AACL,cAAU,cAAc,IAAI,IAAI,GAAG,qBAAqB,GAAG;AAAA,EAC7D;AAEA,QAAM,EAAE,OAAO,KAAK,CAAC,IAAI,OAAO,GAAG,MAAM,CAAC,QAAe;AAEvD,YAAQ,KAAK,8CAA8C,IAAI,OAAO;AAAA,EACxE,CAAC;AACH;",
4
+ "mappings": ";AASA,SAAS,aAAa;AACtB,OAAO,QAAQ;AACf,OAAO,UAAU;AACjB,SAAS,qBAAqB;AAE9B,MAAM,aAAa,cAAc,YAAY,GAAG;AAChD,MAAM,YAAY,KAAK,QAAQ,UAAU;AACzC,MAAM,QAAQ,KAAK,QAAQ,UAAU,MAAM;AAE3C,IAAI,OAAO;AAIT,+BAA6B,QAAQ,GAAG;AACxC,QAAM,EAAE,gBAAgB,IAAI,MAAM,OAAO,mBAAmB;AAC5D,QAAM,gBAAgB,QAAQ,KAAK,MAAM,CAAC,CAAC,EAAE,MAAM;AACrD,OAAO;AAIL,MAAI;AACF,UAAM,EAAE,aAAa,IAAI,MAAM,OAAO,sBAAsB;AAC5D,UAAM,EAAE,iBAAiB,IAAI,MAAM,OAAO,yBAAyB;AACnE,UAAM,WAAW,MAAM,aAAa,EAAE,KAAK,QAAQ,IAAI,GAAG,KAAK,OAAO,SAAS,CAAC,EAAE,CAAC;AACnF,QAAI,SAAS,eAAe,MAAM;AAChC,YAAM,iBAAiB,QAAQ,IAAI,GAAG,SAAS,WAAW;AAAA,IAC5D;AAAA,EACF,QAAQ;AAAA,EAER;AAGA,QAAM,mBAAmB,KAAK,KAAK,WAAW,iBAAiB;AAC/D,QAAM,aAAa;AAAA,IACjB;AAAA,IACA;AAAA,MACE;AAAA,MACA;AAAA,MACA;AAAA,MACA,GAAG,QAAQ,KAAK,MAAM,CAAC;AAAA,IACzB;AAAA,IACA,EAAE,OAAO,WAAW,QAAQ,MAAM;AAAA,EACpC;AACA,MAAI,WAAW,OAAO,KAAM,8BAA6B,WAAW,GAAG;AACvE,QAAM,SAAS,MAAM;AACrB,UAAQ,WAAW,OAAO,YAAY;AACxC;AAQA,SAAS,sBAAsB,UAA0B;AACvD,QAAM,UAAU,YAAY,IAAI,IAAI,KAAK,KAAK,WAAW,CAAC;AAC1D,MAAI,OAAO;AACX,WAAS,IAAI,SAAS,IAAI,UAAU,KAAK;AACvC,YAAQ,MAAM,OAAO,CAAC;AAAA,EACxB;AACA,SAAO,OAAO,KAAK,SAAS,EAAE,EAAE,YAAY;AAC9C;AAUA,SAAS,6BAA6B,KAAmB;AACvD,QAAM,WAAW,GAAG,KAAK,EAAE;AAC3B,QAAM,OAAO,sBAAsB,QAAQ;AAE3C,MAAI;AACJ,MAAI,QAAQ,aAAa,SAAS;AAChC,UAAM,WAAW;AAAA,MACf,wBAAwB,GAAG;AAAA,MAC3B,0BAA0B,IAAI;AAAA,MAC9B;AAAA,IACF,EAAE,KAAK,IAAI;AACX,cAAU,wBAAwB,QAAQ;AAAA,EAC5C,OAAO;AACL,cAAU,cAAc,IAAI,IAAI,GAAG,qBAAqB,GAAG;AAAA,EAC7D;AAEA,QAAM,EAAE,OAAO,KAAK,CAAC,IAAI,OAAO,GAAG,MAAM,CAAC,QAAe;AAEvD,YAAQ,KAAK,8CAA8C,IAAI,OAAO;AAAA,EACxE,CAAC;AACH;",
5
5
  "names": []
6
6
  }
@@ -5,13 +5,19 @@
5
5
  * - neutral: Node/browser shared package
6
6
  */
7
7
  export type BuildTarget = "node" | "browser" | "neutral";
8
+ /**
9
+ * npm registry publish configuration
10
+ */
11
+ export interface SdNpmPublishConfig {
12
+ type: "npm";
13
+ }
8
14
  /**
9
15
  * Package publish configuration
10
- * - "npm": deploy to npm registry
16
+ * - SdNpmPublishConfig: deploy to npm registry
11
17
  * - SdLocalDirectoryPublishConfig: copy to local directory
12
18
  * - SdStoragePublishConfig: upload to FTP/FTPS/SFTP server
13
19
  */
14
- export type SdPublishConfig = "npm" | SdLocalDirectoryPublishConfig | SdStoragePublishConfig;
20
+ export type SdPublishConfig = SdNpmPublishConfig | SdLocalDirectoryPublishConfig | SdStoragePublishConfig;
15
21
  /**
16
22
  * Local directory publish configuration
17
23
  */
@@ -224,7 +230,7 @@ export interface SdConfigParams {
224
230
  /** development mode flag */
225
231
  dev: boolean;
226
232
  /** additional options (from CLI's -o flag) */
227
- opt: string[];
233
+ options: string[];
228
234
  }
229
235
  /**
230
236
  * sd.config.ts must default export a function of the following form: