@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
package/dist/capacitor/capacitor.js CHANGED
@@ -1,15 +1,5 @@
1
1
  import path from "path";
2
- import {
3
- fsExists,
4
- fsMkdir,
5
- fsRead,
6
- fsReadJson,
7
- fsWrite,
8
- fsWriteJson,
9
- fsGlob,
10
- fsCopy,
11
- fsRm
12
- } from "@simplysm/core-node";
2
+ import { fsx } from "@simplysm/core-node";
13
3
  import { env } from "@simplysm/core-common";
14
4
  import { consola } from "consola";
15
5
  import sharp from "sharp";
@@ -39,7 +29,7 @@ class Capacitor {
39
29
  */
40
30
  static async create(pkgPath, config) {
41
31
  Capacitor._validateConfig(config);
42
- const npmConfig = await fsReadJson(path.resolve(pkgPath, "package.json"));
32
+ const npmConfig = await fsx.readJson(path.resolve(pkgPath, "package.json"));
43
33
  return new Capacitor(pkgPath, config, npmConfig);
44
34
  }
45
35
  /**
@@ -55,6 +45,9 @@ class Capacitor {
55
45
  if (typeof config.appName !== "string" || config.appName.trim() === "") {
56
46
  throw new CapacitorConfigError("capacitor.appName is required.");
57
47
  }
48
+ if (!/^[a-zA-Z0-9 \-]+$/.test(config.appName)) {
49
+ throw new CapacitorConfigError(`capacitor.appName contains invalid characters: ${config.appName}`);
50
+ }
58
51
  if (config.platform != null) {
59
52
  const platforms = Object.keys(config.platform);
60
53
  for (const p of platforms) {
@@ -78,21 +71,21 @@ class Capacitor {
78
71
  */
79
72
  async _acquireLock() {
80
73
  const lockPath = path.resolve(this._capPath, Capacitor._LOCK_FILE_NAME);
81
- if (await fsExists(lockPath)) {
82
- const lockContent = await fsRead(lockPath);
74
+ if (await fsx.exists(lockPath)) {
75
+ const lockContent = await fsx.read(lockPath);
83
76
  throw new Error(
84
77
  `Another Capacitor operation is in progress (PID: ${lockContent}). If there's an issue, delete the ${lockPath} file.`
85
78
  );
86
79
  }
87
- await fsMkdir(this._capPath);
88
- await fsWrite(lockPath, String(process.pid));
80
+ await fsx.mkdir(this._capPath);
81
+ await fsx.write(lockPath, String(process.pid));
89
82
  }
90
83
  /**
91
84
  * F10: Release lock
92
85
  */
93
86
  async _releaseLock() {
94
87
  const lockPath = path.resolve(this._capPath, Capacitor._LOCK_FILE_NAME);
95
- await fsRm(lockPath);
88
+ await fsx.rm(lockPath);
96
89
  }
97
90
  /**
98
91
  * F4: Validate external tools
@@ -211,7 +204,7 @@ class Capacitor {
211
204
  const installResult = await this._exec("pnpm", ["install"], this._capPath);
212
205
  Capacitor._logger.debug(`pnpm install completed: ${installResult}`);
213
206
  const configPath = path.resolve(this._capPath, "capacitor.config.ts");
214
- if (!await fsExists(configPath)) {
207
+ if (!await fsx.exists(configPath)) {
215
208
  await this._exec(
216
209
  "npx",
217
210
  ["cap", "init", this._config.appName, this._config.appId],
@@ -219,8 +212,8 @@ class Capacitor {
219
212
  );
220
213
  }
221
214
  const wwwPath = path.resolve(this._capPath, "www");
222
- await fsMkdir(wwwPath);
223
- await fsWrite(
215
+ await fsx.mkdir(wwwPath);
216
+ await fsx.write(
224
217
  path.resolve(wwwPath, "index.html"),
225
218
  "<!DOCTYPE html><html><head></head><body></body></html>"
226
219
  );
@@ -231,12 +224,12 @@ class Capacitor {
231
224
  */
232
225
  async _setupNpmConf() {
233
226
  const projNpmConfigPath = path.resolve(this._pkgPath, "../../package.json");
234
- if (!await fsExists(projNpmConfigPath)) {
227
+ if (!await fsx.exists(projNpmConfigPath)) {
235
228
  throw new Error(`root package.json not found: ${projNpmConfigPath}`);
236
229
  }
237
- const projNpmConfig = await fsReadJson(projNpmConfigPath);
230
+ const projNpmConfig = await fsx.readJson(projNpmConfigPath);
238
231
  const capNpmConfPath = path.resolve(this._capPath, "package.json");
239
- const orgCapNpmConf = await fsExists(capNpmConfPath) ? await fsReadJson(capNpmConfPath) : { name: "", version: "" };
232
+ const orgCapNpmConf = await fsx.exists(capNpmConfPath) ? await fsx.readJson(capNpmConfPath) : { name: "", version: "" };
240
233
  const capNpmConf = { ...orgCapNpmConf };
241
234
  capNpmConf.name = this._config.appId;
242
235
  capNpmConf.version = this._npmConfig.version;
@@ -276,8 +269,8 @@ class Capacitor {
276
269
  Capacitor._logger.debug(`plugin added: ${plugin}@${version}`);
277
270
  }
278
271
  }
279
- await fsMkdir(this._capPath);
280
- await fsWriteJson(capNpmConfPath, capNpmConf, { space: 2 });
272
+ await fsx.mkdir(this._capPath);
273
+ await fsx.writeJson(capNpmConfPath, capNpmConf, { space: 2 });
281
274
  const isChanged = orgCapNpmConf.volta !== capNpmConf.volta || JSON.stringify(orgCapNpmConf.dependencies) !== JSON.stringify(capNpmConf.dependencies) || JSON.stringify(orgCapNpmConf.devDependencies) !== JSON.stringify(capNpmConf.devDependencies);
282
275
  return isChanged;
283
276
  }
@@ -309,7 +302,7 @@ const config: CapacitorConfig = {
309
302
 
310
303
  export default config;
311
304
  `;
312
- await fsWrite(confPath, configContent);
305
+ await fsx.write(confPath, configContent);
313
306
  }
314
307
  /**
315
308
  * Add platform (F12: ensure idempotency)
@@ -317,7 +310,7 @@ export default config;
317
310
  async _addPlatforms() {
318
311
  for (const platform of this._platforms) {
319
312
  const platformPath = path.resolve(this._capPath, platform);
320
- if (await fsExists(platformPath)) {
313
+ if (await fsx.exists(platformPath)) {
321
314
  Capacitor._logger.debug(`platform already exists: ${platform}`);
322
315
  continue;
323
316
  }
@@ -331,14 +324,14 @@ export default config;
331
324
  const assetsDirPath = path.resolve(this._capPath, "assets");
332
325
  if (this._config.icon != null) {
333
326
  const iconSource = path.resolve(this._pkgPath, this._config.icon);
334
- if (!await fsExists(iconSource)) {
327
+ if (!await fsx.exists(iconSource)) {
335
328
  Capacitor._logger.warn(
336
329
  `icon file not found: ${iconSource}. Using default icon.`
337
330
  );
338
331
  return;
339
332
  }
340
333
  try {
341
- await fsMkdir(assetsDirPath);
334
+ await fsx.mkdir(assetsDirPath);
342
335
  const logoPath = path.resolve(assetsDirPath, "logo.png");
343
336
  const logoSize = Math.floor(1024 * 0.6);
344
337
  const padding = Math.floor((1024 - logoSize) / 2);
@@ -370,7 +363,7 @@ export default config;
370
363
  );
371
364
  }
372
365
  } else {
373
- await fsRm(assetsDirPath);
366
+ await fsx.rm(assetsDirPath);
374
367
  }
375
368
  }
376
369
  //#endregion
@@ -380,7 +373,7 @@ export default config;
380
373
  */
381
374
  async _configureAndroid() {
382
375
  const androidPath = path.resolve(this._capPath, "android");
383
- if (!await fsExists(androidPath)) {
376
+ if (!await fsx.exists(androidPath)) {
384
377
  throw new Error(`Android project directory not found: ${androidPath}`);
385
378
  }
386
379
  await this._configureAndroidJavaHomePath(androidPath);
@@ -393,18 +386,18 @@ export default config;
393
386
  */
394
387
  async _configureAndroidJavaHomePath(androidPath) {
395
388
  const gradlePropsPath = path.resolve(androidPath, "gradle.properties");
396
- if (!await fsExists(gradlePropsPath)) {
389
+ if (!await fsx.exists(gradlePropsPath)) {
397
390
  Capacitor._logger.warn(`gradle.properties file not found: ${gradlePropsPath}`);
398
391
  return;
399
392
  }
400
- let content = await fsRead(gradlePropsPath);
393
+ let content = await fsx.read(gradlePropsPath);
401
394
  const java21Path = await this._findJava21();
402
395
  if (java21Path != null && !content.includes("org.gradle.java.home")) {
403
396
  const escapedPath = java21Path.replace(/\\/g, "\\\\");
404
397
  content += `
405
398
  org.gradle.java.home=${escapedPath}
406
399
  `;
407
- await fsWrite(gradlePropsPath, content);
400
+ await fsx.write(gradlePropsPath, content);
408
401
  }
409
402
  }
410
403
  /**
@@ -420,7 +413,7 @@ org.gradle.java.home=${escapedPath}
420
413
  "/usr/lib/jvm/temurin-21*"
421
414
  ];
422
415
  for (const pattern of patterns) {
423
- const matches = await fsGlob(pattern);
416
+ const matches = await fsx.glob(pattern);
424
417
  if (matches.length > 0) {
425
418
  return matches.sort().at(-1);
426
419
  }
@@ -434,7 +427,7 @@ org.gradle.java.home=${escapedPath}
434
427
  const localPropsPath = path.resolve(androidPath, "local.properties");
435
428
  const sdkPath = await this._findAndroidSdk();
436
429
  if (sdkPath != null) {
437
- await fsWrite(localPropsPath, `sdk.dir=${sdkPath.replace(/\\/g, "/")}
430
+ await fsx.write(localPropsPath, `sdk.dir=${sdkPath.replace(/\\/g, "/")}
438
431
  `);
439
432
  } else {
440
433
  throw new Error(
@@ -447,7 +440,7 @@ org.gradle.java.home=${escapedPath}
447
440
  */
448
441
  async _findAndroidSdk() {
449
442
  const fromEnv = env["ANDROID_HOME"] ?? env["ANDROID_SDK_ROOT"];
450
- if (fromEnv != null && await fsExists(fromEnv)) {
443
+ if (fromEnv != null && await fsx.exists(fromEnv)) {
451
444
  return fromEnv;
452
445
  }
453
446
  const candidates = [
@@ -457,7 +450,7 @@ org.gradle.java.home=${escapedPath}
457
450
  "C:/Android/Sdk"
458
451
  ];
459
452
  for (const candidate of candidates) {
460
- if (await fsExists(candidate)) {
453
+ if (await fsx.exists(candidate)) {
461
454
  return candidate;
462
455
  }
463
456
  }
@@ -468,10 +461,10 @@ org.gradle.java.home=${escapedPath}
468
461
  */
469
462
  async _configureAndroidManifest(androidPath) {
470
463
  const manifestPath = path.resolve(androidPath, "app/src/main/AndroidManifest.xml");
471
- if (!await fsExists(manifestPath)) {
464
+ if (!await fsx.exists(manifestPath)) {
472
465
  throw new Error(`AndroidManifest.xml file not found: ${manifestPath}`);
473
466
  }
474
- let content = await fsRead(manifestPath);
467
+ let content = await fsx.read(manifestPath);
475
468
  if (!content.includes("android:usesCleartextTraffic")) {
476
469
  content = content.replace("<application", '<application android:usesCleartextTraffic="true"');
477
470
  }
@@ -517,17 +510,17 @@ org.gradle.java.home=${escapedPath}
517
510
  );
518
511
  }
519
512
  }
520
- await fsWrite(manifestPath, content);
513
+ await fsx.write(manifestPath, content);
521
514
  }
522
515
  /**
523
516
  * Modify build.gradle (F3: add error handling)
524
517
  */
525
518
  async _configureAndroidBuildGradle(androidPath) {
526
519
  const buildGradlePath = path.resolve(androidPath, "app/build.gradle");
527
- if (!await fsExists(buildGradlePath)) {
520
+ if (!await fsx.exists(buildGradlePath)) {
528
521
  throw new Error(`build.gradle file not found: ${buildGradlePath}`);
529
522
  }
530
- let content = await fsRead(buildGradlePath);
523
+ let content = await fsx.read(buildGradlePath);
531
524
  const version = this._npmConfig.version;
532
525
  const cleanVersion = version.replace(/-.*$/, "");
533
526
  const versionParts = cleanVersion.split(".");
@@ -549,10 +542,10 @@ org.gradle.java.home=${escapedPath}
549
542
  const signConfig = this._config.platform?.android?.sign;
550
543
  if (signConfig) {
551
544
  const keystoreSource = path.resolve(this._pkgPath, signConfig.keystore);
552
- if (!await fsExists(keystoreSource)) {
545
+ if (!await fsx.exists(keystoreSource)) {
553
546
  throw new Error(`keystore file not found: ${keystoreSource}`);
554
547
  }
555
- await fsCopy(keystoreSource, keystorePath);
548
+ await fsx.copy(keystoreSource, keystorePath);
556
549
  const keystoreRelativePath = path.relative(path.dirname(buildGradlePath), keystorePath).replace(/\\/g, "/");
557
550
  const keystoreType = signConfig.keystoreType ?? "jks";
558
551
  if (!content.includes("signingConfigs")) {
@@ -560,9 +553,9 @@ org.gradle.java.home=${escapedPath}
560
553
  signingConfigs {
561
554
  release {
562
555
  storeFile file("${keystoreRelativePath}")
563
- storePassword '${signConfig.storePassword}'
564
- keyAlias '${signConfig.alias}'
565
- keyPassword '${signConfig.password}'
556
+ storePassword '${Capacitor._escapeGroovyString(signConfig.storePassword)}'
557
+ keyAlias '${Capacitor._escapeGroovyString(signConfig.alias)}'
558
+ keyPassword '${Capacitor._escapeGroovyString(signConfig.password)}'
566
559
  storeType "${keystoreType}"
567
560
  }
568
561
  }
@@ -577,9 +570,16 @@ org.gradle.java.home=${escapedPath}
577
570
  );
578
571
  }
579
572
  } else {
580
- await fsRm(keystorePath);
573
+ await fsx.rm(keystorePath);
581
574
  }
582
- await fsWrite(buildGradlePath, content);
575
+ await fsx.write(buildGradlePath, content);
576
+ }
577
+ /**
578
+ * Escape single quotes in Groovy string (for use in single-quoted strings)
579
+ * Groovy: 'string with \'single quote\' inside'
580
+ */
581
+ static _escapeGroovyString(value) {
582
+ return value.replace(/'/g, "\\'");
583
583
  }
584
584
  //#endregion
585
585
  //#region Private - Build
@@ -614,23 +614,23 @@ org.gradle.java.home=${escapedPath}
614
614
  buildType,
615
615
  fileName
616
616
  );
617
- const actualPath = await fsExists(sourcePath) ? sourcePath : path.resolve(
617
+ const actualPath = await fsx.exists(sourcePath) ? sourcePath : path.resolve(
618
618
  androidPath,
619
619
  "app/build/outputs",
620
620
  outputType,
621
621
  buildType,
622
622
  `app-${buildType}.${ext}`
623
623
  );
624
- if (!await fsExists(actualPath)) {
624
+ if (!await fsx.exists(actualPath)) {
625
625
  Capacitor._logger.warn(`build output not found: ${actualPath}`);
626
626
  return;
627
627
  }
628
628
  const outputFileName = `${this._config.appName}${isSigned ? "" : "-unsigned"}-latest.${ext}`;
629
- await fsMkdir(targetOutPath);
630
- await fsCopy(actualPath, path.resolve(targetOutPath, outputFileName));
629
+ await fsx.mkdir(targetOutPath);
630
+ await fsx.copy(actualPath, path.resolve(targetOutPath, outputFileName));
631
631
  const updatesPath = path.resolve(targetOutPath, "updates");
632
- await fsMkdir(updatesPath);
633
- await fsCopy(actualPath, path.resolve(updatesPath, `${this._npmConfig.version}.${ext}`));
632
+ await fsx.mkdir(updatesPath);
633
+ await fsx.copy(actualPath, path.resolve(updatesPath, `${this._npmConfig.version}.${ext}`));
634
634
  }
635
635
  //#endregion
636
636
  //#region Private - Device Execution
@@ -639,15 +639,15 @@ org.gradle.java.home=${escapedPath}
639
639
  */
640
640
  async _updateServerUrl(url) {
641
641
  const configPath = path.resolve(this._capPath, "capacitor.config.ts");
642
- if (!await fsExists(configPath)) return;
643
- let content = await fsRead(configPath);
642
+ if (!await fsx.exists(configPath)) return;
643
+ let content = await fsx.read(configPath);
644
644
  if (content.includes("url:")) {
645
645
  content = content.replace(/url:\s*"[^"]*"/, `url: "${url}"`);
646
646
  } else if (content.includes("server:")) {
647
647
  content = content.replace(/server:\s*\{/, `server: {
648
648
  url: "${url}",`);
649
649
  }
650
- await fsWrite(configPath, content);
650
+ await fsx.write(configPath, content);
651
651
  }
652
652
  //#endregion
653
653
  //#region Private - Utilities
package/dist/capacitor/capacitor.js.map CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/capacitor/capacitor.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
package/dist/commands/check.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { execa } from "execa";
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 { executeTypecheck } from "./typecheck.js";
5
5
  import { consola } from "consola";
6
6
  async function spawnVitest(targets) {
@@ -24,7 +24,7 @@ async function spawnVitest(targets) {
24
24
  success: false,
25
25
  errorCount: 1,
26
26
  warningCount: 0,
27
- formattedOutput: errorMessage(err)
27
+ formattedOutput: errNs.message(err)
28
28
  };
29
29
  }
30
30
  }
@@ -66,7 +66,7 @@ async function runCheck(options) {
66
66
  const lintWorkerPath = import.meta.resolve("../workers/lint.worker");
67
67
  const lintWorker = Worker.create(lintWorkerPath);
68
68
  tasks.push(
69
- lintWorker.lint({ targets, fix: true, timing: false }).then(
69
+ lintWorker.lint({ targets, fix: false, timing: false }).then(
70
70
  (r) => ({
71
71
  name: "LINT",
72
72
  success: r.success,
@@ -90,7 +90,7 @@ async function runCheck(options) {
90
90
  success: false,
91
91
  errorCount: 1,
92
92
  warningCount: 0,
93
- formattedOutput: errorMessage(r.reason)
93
+ formattedOutput: errNs.message(r.reason)
94
94
  };
95
95
  });
96
96
  const order = ["TYPECHECK", "LINT", "TEST"];
package/dist/commands/check.js.map CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/commands/check.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
package/dist/commands/device.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import path from "path";
2
- import { fsExists } from "@simplysm/core-node";
2
+ import { fsx } from "@simplysm/core-node";
3
3
  import { consola } from "consola";
4
4
  import { loadSdConfig } from "../utils/sd-config.js";
5
5
  import { Capacitor } from "../capacitor/capacitor.js";
@@ -11,7 +11,7 @@ async function runDevice(options) {
11
11
  logger.debug("device start", { package: packageName, url });
12
12
  let sdConfig;
13
13
  try {
14
- sdConfig = await loadSdConfig({ cwd, dev: true, opt: options.options });
14
+ sdConfig = await loadSdConfig({ cwd, dev: true, options: options.options });
15
15
  logger.debug("sd.config.ts loaded");
16
16
  } catch (err) {
17
17
  logger.error(`Failed to load sd.config.ts: ${err instanceof Error ? err.message : err}`);
@@ -71,7 +71,7 @@ async function runDevice(options) {
71
71
  }
72
72
  logger.debug("development server URL", { serverUrl });
73
73
  const capPath = path.join(pkgDir, ".capacitor");
74
- if (!await fsExists(capPath)) {
74
+ if (!await fsx.exists(capPath)) {
75
75
  logger.error(
76
76
  `Capacitor project is not initialized. First run 'pnpm watch ${packageName}'.`
77
77
  );
package/dist/commands/device.js.map CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/commands/device.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
package/dist/commands/lint.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { ESLint } from "eslint";
2
2
  import { createJiti } from "jiti";
3
3
  import path from "path";
4
- import { fsExists, fsGlob, pathFilterByTargets } from "@simplysm/core-node";
4
+ import { fsx, pathx } from "@simplysm/core-node";
5
5
  import "@simplysm/core-common";
6
6
  import { SdError } from "@simplysm/core-common";
7
7
  import { consola } from "consola";
@@ -23,7 +23,7 @@ async function loadIgnorePatterns(cwd) {
23
23
  let configPath;
24
24
  for (const f of ESLINT_CONFIG_FILES) {
25
25
  const p = path.join(cwd, f);
26
- if (await fsExists(p)) {
26
+ if (await fsx.exists(p)) {
27
27
  configPath = p;
28
28
  break;
29
29
  }
@@ -63,13 +63,13 @@ async function executeLint(options) {
63
63
  logger.debug("ignore patterns loaded", { ignorePatternCount: ignorePatterns.length });
64
64
  logger.success(`loaded ESLint config (${ignorePatterns.length} ignore patterns)`);
65
65
  logger.start("collecting lint target files");
66
- let files = await fsGlob("**/*.{ts,tsx,js,jsx}", {
66
+ let files = await fsx.glob("**/*.{ts,tsx,js,jsx}", {
67
67
  cwd,
68
68
  ignore: ignorePatterns,
69
69
  nodir: true,
70
70
  absolute: true
71
71
  });
72
- files = pathFilterByTargets(files, targets, cwd);
72
+ files = pathx.filterByTargets(files, targets, cwd);
73
73
  logger.debug("file collection complete", { fileCount: files.length });
74
74
  logger.success(`collected lint target files (${files.length} files)`);
75
75
  let eslint;
package/dist/commands/lint.js.map CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/commands/lint.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }