@simplysm/sd-cli 13.0.85 → 13.0.87

package/templates/init/sd.config.ts.hbs

@@ -3,7 +3,10 @@ import type { SdConfigFn } from "@simplysm/sd-cli";
 const dbPort = Number(process.env["DB_PORT"] ?? 5432);
 const dbDatabase = process.env["DB_DATABASE"] ?? "{{projectName}}";
 
-const config: SdConfigFn = () => ({
+const config: SdConfigFn = ({ dev }) => ({
+  replaceDeps: {
+    "@simplysm/*": "../simplysm/packages/*",
+  },
   packages: {
     "db-main": { target: "neutral" },
     "client-admin": {
@@ -16,14 +19,23 @@ const config: SdConfigFn = () => ({
       pm2: {},
       configs: {
         orm: {
-          default: {
-            dialect: "postgresql",
-            host: "localhost",
-            port: dbPort,
-            username: "postgres",
-            password: "1234",
-            database: dbDatabase,
-          },
+          default: dev
+            ? {
+                dialect: "postgresql",
+                host: "localhost",
+                port: dbPort,
+                username: "postgres",
+                password: "1234",
+                database: dbDatabase,
+              }
+            : {
+                dialect: "postgresql",
+                host: "localhost",
+                port: 5432,
+                username: "postgres",
+                password: "TODO",
+                database: "{{projectName}}",
+              },
         },
         auth: {
           jwtSecret: "{{jwtSecret}}",

package/templates/init/{tests/e2e → tests-e2e}/package.json.hbs

@@ -6,7 +6,7 @@
   "private": true,
   "dependencies": {
     "@{{projectName}}/db-main": "workspace:*",
-    "@simplysm/orm-node": "~13.0.85",
+    "@simplysm/orm-node": "~13.0.87",
     "bcrypt": "^6.0.0",
     "playwright": "^1.58.2"
   },

package/templates/init/{tests/e2e → tests-e2e}/vitest.setup.ts.hbs

@@ -8,7 +8,7 @@ import { chromium } from "playwright";
 import type { TestProject } from "vitest/node";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const rootDir = path.resolve(__dirname, "../..");
+const rootDir = path.resolve(__dirname, "..");
 
 const DB_CONFIG = {
   dialect: "postgresql" as const,

package/templates/init/tsconfig.json.hbs

@@ -34,6 +34,7 @@
     "packages/*/src/**/*.tsx",
     "packages/*/tests/**/*.ts",
     "packages/*/tests/**/*.tsx",
-    "tests/**/*.ts"
+    "tests/**/*.ts",
+    "tests-e2e/**/*.ts"
   ]
 }

package/templates/init/vitest-e2e.config.ts

@@ -0,0 +1,23 @@
+import { defineConfig } from "vitest/config";
+import tsconfigPaths from "vite-tsconfig-paths";
+
+export default defineConfig({
+  plugins: [
+    tsconfigPaths({
+      root: ".",
+      projects: ["./tsconfig.json"],
+    }),
+  ],
+  define: {
+    "process.env.DEV": JSON.stringify("true"),
+    "process.env.VER": JSON.stringify("1.0.0-test"),
+  },
+  test: {
+    globals: true,
+    environment: "node",
+    include: ["tests-e2e/src/**/*.spec.ts"],
+    globalSetup: "./tests-e2e/vitest.setup.ts",
+    fileParallelism: false,
+    testTimeout: 30000,
+  },
+});

package/templates/init/vitest.config.ts

@@ -22,9 +22,7 @@ export default defineConfig({
     coverage: {
       reportsDirectory: "./.coverage",
     },
-    // Define as projects array here
     projects: [
-      // Unit tests (tests within packages)
       {
         extends: true,
         test: {
@@ -33,17 +31,6 @@ export default defineConfig({
           testTimeout: 30000,
         },
       },
-      // E2E tests (requires Docker + dev server)
-      {
-        extends: true,
-        test: {
-          name: "e2e",
-          include: ["tests/e2e/src/**/*.spec.ts"],
-          globalSetup: "./tests/e2e/vitest.setup.ts",
-          fileParallelism: false,
-          testTimeout: 30000,
-        },
-      },
     ],
   },
 });

package/docs/commands.md

@@ -1,177 +0,0 @@
-# CLI Commands
-
-All commands support the `--debug` flag for verbose logging.
-
-## dev
-
-Run client and server packages in development mode.
-
-```
-sd-cli dev [targets..]
-```
-
-| Option | Alias | Description |
-|--------|-------|-------------|
-| `targets` | | Package paths to run (e.g., `packages/solid-demo`). Omit for all. |
-| `--opt <value>` | `-o` | Options to pass to `sd.config.ts` (repeatable). |
-
-- **client** targets start a Vite dev server with HMR.
-- **server** targets run an esbuild watch build and spawn a server runtime process.
-- Server-connected clients are proxied through the server automatically.
-- Capacitor projects are initialized if configured.
-- Terminates on SIGINT / SIGTERM.
-
-## watch
-
-Build library packages in watch mode.
-
-```
-sd-cli watch [targets..]
-```
-
-| Option | Alias | Description |
-|--------|-------|-------------|
-| `targets` | | Package paths to watch. Omit for all. |
-| `--opt <value>` | `-o` | Options to pass to `sd.config.ts` (repeatable). |
-
-- Applies to `node`, `browser`, and `neutral` target packages only.
-- Runs esbuild in watch mode and generates `.d.ts` declaration files.
-- Terminates on SIGINT / SIGTERM.
-
-## build
-
-Run a production build.
-
-```
-sd-cli build [targets..]
-```
-
-| Option | Alias | Description |
-|--------|-------|-------------|
-| `targets` | | Package paths to build. Omit for all. |
-| `--opt <value>` | `-o` | Options to pass to `sd.config.ts` (repeatable). |
-
-Build pipeline:
-1. Clean `dist/` folders.
-2. Run lint and build concurrently.
-3. **node/browser/neutral** targets: esbuild JS bundle + `.d.ts` generation (with type checking).
-4. **client** targets: Vite production build + type checking + optional Capacitor/Electron build.
-5. **server** targets: esbuild JS bundle.
-6. Sets `process.exitCode = 1` on any failure.
-
-## publish
-
-Build and publish packages.
-
-```
-sd-cli publish [targets..]
-```
-
-| Option | Alias | Description |
-|--------|-------|-------------|
-| `targets` | | Package paths to publish. Omit for all with `publish` config. |
-| `--no-build` | | Skip the build step (dangerous). |
-| `--dry-run` | | Simulate without actual deployment. |
-| `--opt <value>` | `-o` | Options to pass to `sd.config.ts` (repeatable). |
-
-Deployment order:
-1. Pre-validation (npm auth, Git status, SSH key setup for SFTP).
-2. Version upgrade (patch or prerelease bump in all `package.json` files and templates).
-3. Build.
-4. Git commit, tag, and push.
-5. Publish packages by dependency level (npm / local-directory / FTP / FTPS / SFTP).
-6. Run `postPublish` scripts (failures are warned but do not block).
-
-## lint
-
-Run ESLint (with Stylelint support).
-
-```
-sd-cli lint [targets..]
-```
-
-| Option | Alias | Description |
-|--------|-------|-------------|
-| `targets` | | Package paths to lint. Omit for all. |
-| `--fix` | | Auto-fix issues. |
-| `--timing` | | Print execution time per ESLint rule. |
-
-- Reads `eslint.config.ts` (or `.mts`, `.js`, `.mjs`) for global ignore patterns.
-- Uses ESLint cache (`.cache/eslint.cache`).
-
-## typecheck
-
-Run TypeScript type checking.
-
-```
-sd-cli typecheck [targets..]
-```
-
-| Option | Alias | Description |
-|--------|-------|-------------|
-| `targets` | | Package paths to check. Omit for all. |
-| `--opt <value>` | `-o` | Options to pass to `sd.config.ts` (repeatable). |
-
-- Loads `tsconfig.json` and `sd.config.ts` to determine per-package environments.
-- **neutral** packages are checked in both `node` and `browser` environments.
-- Uses parallel Worker threads for concurrent type checking.
-- Uses incremental compilation (`.cache/typecheck-{env}.tsbuildinfo`).
-
-## check
-
-Run typecheck, lint, and test in parallel.
-
-```
-sd-cli check [targets..]
-```
-
-| Option | Alias | Description |
-|--------|-------|-------------|
-| `targets` | | Package paths to check. Omit for all. |
-| `--type <types>` | | Comma-separated check types: `typecheck`, `lint`, `test`. Default: all three. |
-
-Runs the selected checks concurrently and prints a combined summary.
-
-## device
-
-Run an app on an Android device or Electron.
-
-```
-sd-cli device -p <package>
-```
-
-| Option | Alias | Description |
-|--------|-------|-------------|
-| `--package <name>` | `-p` | Package name (required). |
-| `--url <url>` | `-u` | Development server URL (optional; derived from config if omitted). |
-| `--opt <value>` | `-o` | Options to pass to `sd.config.ts` (repeatable). |
-
-- Only works with **client** target packages that have `capacitor` or `electron` configuration.
-- Connects the development server URL to the native WebView for hot reload.
-
-## init
-
-Initialize a new Simplysm project.
-
-```
-sd-cli init
-```
-
-- Must be run from an empty directory.
-- Prompts for project description and server port.
-- Generates project scaffolding from built-in Handlebars templates.
-- Runs `pnpm install` after file generation.
-
-## replace-deps
-
-Replace `node_modules` packages with symlinks to local source directories.
-
-```
-sd-cli replace-deps
-```
-
-| Option | Alias | Description |
-|--------|-------|-------------|
-| `--opt <value>` | `-o` | Options to pass to `sd.config.ts` (repeatable). |
-
-Uses the `replaceDeps` mapping from `sd.config.ts` to create symlinks.

package/docs/configuration.md

@@ -1,211 +0,0 @@
-# Configuration Types
-
-All types are exported from the package entry point:
-
-```typescript
-import type { SdConfig, SdConfigFn, SdConfigParams, ... } from "@simplysm/sd-cli";
-```
-
-## SdConfigFn
-
-The function signature that `sd.config.ts` must default-export.
-
-```typescript
-type SdConfigFn = (params: SdConfigParams) => SdConfig | Promise<SdConfig>;
-```
-
-## SdConfigParams
-
-Parameters passed to the config function.
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `cwd` | `string` | Current working directory. |
-| `dev` | `boolean` | `true` in dev/watch mode, `false` in build/publish. |
-| `options` | `string[]` | Additional options from CLI `-o` flag. |
-
-## SdConfig
-
-Top-level configuration object.
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `packages` | `Record<string, SdPackageConfig \| undefined>` | Per-package configuration. Key is the subdirectory name under `packages/`. |
-| `replaceDeps` | `Record<string, string>` | Dependency replacement mapping. Key: glob pattern for packages in `node_modules` (e.g., `@simplysm/*`). Value: local source path (`*` is substituted from key). |
-| `postPublish` | `SdPostPublishScriptConfig[]` | Scripts to execute after deployment completes. |
-
-## SdPackageConfig
-
-Union of all package configuration types:
-
-```typescript
-type SdPackageConfig =
-  | SdBuildPackageConfig
-  | SdClientPackageConfig
-  | SdServerPackageConfig
-  | SdScriptsPackageConfig;
-```
-
-## BuildTarget
-
-```typescript
-type BuildTarget = "node" | "browser" | "neutral";
-```
-
-- `node` -- Node.js only library.
-- `browser` -- Browser only library.
-- `neutral` -- Node/browser shared library.
-
-## SdBuildPackageConfig
-
-Configuration for library packages (`node` / `browser` / `neutral`).
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `target` | `BuildTarget` | Build target. |
-| `publish` | `SdPublishConfig` | Optional publish configuration. |
-| `copySrc` | `string[]` | Glob patterns for files to copy from `src/` to `dist/` (relative to `src/`). |
-
-## SdClientPackageConfig
-
-Configuration for client app packages (Vite dev server).
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `target` | `"client"` | Must be `"client"`. |
-| `server` | `string \| number` | Server package name to connect to, or a Vite port number. |
-| `env` | `Record<string, string>` | Environment variables substituted during build (`process.env` replacement). |
-| `publish` | `SdPublishConfig` | Optional publish configuration. |
-| `capacitor` | `SdCapacitorConfig` | Optional Capacitor configuration. |
-| `electron` | `SdElectronConfig` | Optional Electron configuration. |
-| `configs` | `Record<string, unknown>` | Runtime config written to `dist/.config.json` during build. |
-
-## SdServerPackageConfig
-
-Configuration for server app packages (Fastify server).
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `target` | `"server"` | Must be `"server"`. |
-| `env` | `Record<string, string>` | Environment variables substituted during build. |
-| `publish` | `SdPublishConfig` | Optional publish configuration. |
-| `configs` | `Record<string, unknown>` | Runtime config written to `dist/.config.json` during build. |
-| `externals` | `string[]` | External modules excluded from esbuild bundle. |
-| `pm2` | `{ name?: string; ignoreWatchPaths?: string[] }` | PM2 configuration. Generates `dist/pm2.config.cjs` when specified. |
-| `packageManager` | `"volta" \| "mise"` | Package manager (affects `mise.toml` or Volta settings). |
-
-## SdScriptsPackageConfig
-
-Configuration for scripts-only packages (excluded from watch/typecheck).
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `target` | `"scripts"` | Must be `"scripts"`. |
-
-## SdPublishConfig
-
-Union of publish target types:
-
-```typescript
-type SdPublishConfig =
-  | SdNpmPublishConfig
-  | SdLocalDirectoryPublishConfig
-  | SdStoragePublishConfig;
-```
-
-### SdNpmPublishConfig
-
-```typescript
-interface SdNpmPublishConfig {
-  type: "npm";
-}
-```
-
-### SdLocalDirectoryPublishConfig
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `type` | `"local-directory"` | |
-| `path` | `string` | Deployment target path. Supports `%VER%` and `%PROJECT%` substitution. |
-
-### SdStoragePublishConfig
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `type` | `"ftp" \| "ftps" \| "sftp"` | Storage protocol. |
-| `host` | `string` | Server hostname. |
-| `port` | `number` | Optional port number. |
-| `path` | `string` | Optional remote path. |
-| `user` | `string` | Optional username. |
-| `password` | `string` | Optional password. For SFTP without password, SSH key auth is used automatically. |
-
-## SdPostPublishScriptConfig
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `type` | `"script"` | Must be `"script"`. |
-| `cmd` | `string` | Command to execute. Supports `%VER%` and `%PROJECT%` substitution. |
-| `args` | `string[]` | Command arguments. Supports `%VER%` and `%PROJECT%` substitution. |
-
-## SdCapacitorConfig
-
-Capacitor mobile app configuration.
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `appId` | `string` | App identifier (e.g., `"com.example.app"`). |
-| `appName` | `string` | Display name. |
-| `plugins` | `Record<string, Record<string, unknown> \| true>` | Capacitor plugin configuration. |
-| `icon` | `string` | App icon path (relative to package directory). |
-| `debug` | `boolean` | Debug build flag. |
-| `platform.android` | `SdCapacitorAndroidConfig` | Android-specific settings. |
-
-### SdCapacitorAndroidConfig
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `config` | `Record<string, string>` | AndroidManifest.xml application tag attributes. |
-| `bundle` | `boolean` | Build AAB bundle (`true`) or APK (`false`). |
-| `intentFilters` | `SdCapacitorIntentFilter[]` | Intent filter configuration. |
-| `sign` | `SdCapacitorSignConfig` | APK/AAB signing configuration. |
-| `sdkVersion` | `number` | Android SDK version (minSdk, targetSdk). |
-| `permissions` | `SdCapacitorPermission[]` | Additional Android permissions. |
-
-### SdCapacitorSignConfig
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `keystore` | `string` | Keystore file path (relative to package directory). |
-| `storePassword` | `string` | Keystore password. |
-| `alias` | `string` | Key alias. |
-| `password` | `string` | Key password. |
-| `keystoreType` | `string` | Keystore type (default: `"jks"`). |
-
-### SdCapacitorPermission
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `name` | `string` | Permission name (e.g., `"CAMERA"`). |
-| `maxSdkVersion` | `number` | Maximum SDK version. |
-| `ignore` | `string` | `tools:ignore` attribute value. |
-
-### SdCapacitorIntentFilter
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `action` | `string` | Intent action (e.g., `"android.intent.action.VIEW"`). |
-| `category` | `string` | Intent category (e.g., `"android.intent.category.DEFAULT"`). |
-
-## SdElectronConfig
-
-Electron desktop app configuration.
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `appId` | `string` | App identifier (e.g., `"com.example.myapp"`). |
-| `portable` | `boolean` | `true` for portable `.exe`, `false` for NSIS installer. |
-| `installerIcon` | `string` | Installer icon path (`.ico`, relative to package directory). |
-| `reinstallDependencies` | `string[]` | npm packages to include in Electron (native modules, etc.). |
-| `postInstallScript` | `string` | npm postinstall script. |
-| `nsisOptions` | `Record<string, unknown>` | NSIS options (when `portable` is `false`). |
-| `env` | `Record<string, string>` | Environment variables (accessible via `process.env` in `electron-main.ts`). |

package/docs/vite-config.md

@@ -1,67 +0,0 @@
-# Vite Config API
-
-Utility for generating Vite configuration for SolidJS + TailwindCSS client packages. Exported from the package entry point.
-
-```typescript
-import { createViteConfig, type ViteConfigOptions } from "@simplysm/sd-cli";
-```
-
-## createViteConfig
-
-Creates a Vite `UserConfig` for building or serving a client package.
-
-```typescript
-function createViteConfig(options: ViteConfigOptions): ViteUserConfig;
-```
-
-### ViteConfigOptions
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `pkgDir` | `string` | Absolute path to the package directory. |
-| `name` | `string` | Package name (used as the Vite `base` path: `/<name>/`). |
-| `tsconfigPath` | `string` | Path to `tsconfig.json` for the package. |
-| `compilerOptions` | `Record<string, unknown>` | TypeScript compiler options passed to esbuild. |
-| `env` | `Record<string, string>` | Environment variables substituted via Vite `define` (replaces `process.env`). |
-| `mode` | `"build" \| "dev"` | `"build"` for production (silent logging), `"dev"` for dev server. |
-| `serverPort` | `number` | Server port in dev mode. `0` for auto-assign (server-connected client). |
-| `replaceDeps` | `string[]` | Array of `replaceDeps` package names (for scope watching). |
-| `onScopeRebuild` | `() => void` | Callback when a `replaceDeps` package dist changes. |
-
-### Built-in Plugins
-
-The generated config includes the following Vite plugins:
-
-- **vite-tsconfig-paths** -- Resolves TypeScript path aliases.
-- **vite-plugin-solid** -- SolidJS JSX compilation.
-- **vite-plugin-pwa** -- PWA manifest and service worker generation.
-- **sd-tailwind-config-deps** (dev only, when `replaceDeps` is set) -- Watches Tailwind config dependencies in scope packages and invalidates cache on change.
-- **sd-scope-watch** (dev only, when `replaceDeps` is set) -- Watches `dist/` directories in scope packages and triggers HMR. Excludes scope packages from Vite's `optimizeDeps` to prevent stale pre-bundled cache.
-- **sd-public-dev** (dev only) -- Serves files from `public-dev/` directory with priority over `public/`.
-
-### Usage Example
-
-```typescript
-import { createViteConfig } from "@simplysm/sd-cli";
-
-const config = createViteConfig({
-  pkgDir: "/path/to/packages/my-client",
-  name: "my-client",
-  tsconfigPath: "/path/to/packages/my-client/tsconfig.json",
-  compilerOptions: { jsx: "preserve", jsxImportSource: "solid-js" },
-  mode: "dev",
-  serverPort: 3000,
-});
-```
-
-## getMimeType
-
-Returns a MIME type string for a given file extension. Used internally by the `sd-public-dev` plugin.
-
-```typescript
-function getMimeType(ext: string): string;
-```
-
-Supports common web asset extensions (`.html`, `.css`, `.js`, `.json`, `.png`, `.jpg`, `.svg`, `.ico`, `.woff2`, `.mp4`, etc.). Returns `"application/octet-stream"` for unknown extensions.
-
-> **Note:** This function is exported for testing purposes and is marked `@internal`.