@simplysm/sd-cli 13.0.72 → 13.0.74

package/src/utils/sd-config.ts

@@ -1,44 +1,44 @@
-import path from "path";
-import { createJiti } from "jiti";
-import { SdError } from "@simplysm/core-common";
-import { fsExists } from "@simplysm/core-node";
-import type { SdConfig, SdConfigParams } from "../sd-config.types";
-
-/**
- * Load sd.config.ts
- * @returns SdConfig object
- * @throws if sd.config.ts is missing or format is incorrect
- */
-export async function loadSdConfig(params: SdConfigParams): Promise<SdConfig> {
-  const sdConfigPath = path.resolve(params.cwd, "sd.config.ts");
-
-  if (!(await fsExists(sdConfigPath))) {
-    throw new SdError(`sd.config.ts file not found: ${sdConfigPath}`);
-  }
-
-  const jiti = createJiti(import.meta.url);
-  const sdConfigModule = await jiti.import(sdConfigPath);
-
-  if (
-    sdConfigModule == null ||
-    typeof sdConfigModule !== "object" ||
-    !("default" in sdConfigModule) ||
-    typeof sdConfigModule.default !== "function"
-  ) {
-    throw new SdError(`sd.config.ts must export a function as default: ${sdConfigPath}`);
-  }
-
-  const config = await sdConfigModule.default(params);
-
-  if (
-    config == null ||
-    typeof config !== "object" ||
-    !("packages" in config) ||
-    config.packages == null ||
-    typeof config.packages !== "object" ||
-    Array.isArray(config.packages)
-  ) {
-    throw new SdError(`sd.config.ts return value is not in the correct format: ${sdConfigPath}`);
-  }
-  return config as SdConfig;
-}
+import path from "path";
+import { createJiti } from "jiti";
+import { SdError } from "@simplysm/core-common";
+import { fsExists } from "@simplysm/core-node";
+import type { SdConfig, SdConfigParams } from "../sd-config.types";
+
+/**
+ * Load sd.config.ts
+ * @returns SdConfig object
+ * @throws if sd.config.ts is missing or format is incorrect
+ */
+export async function loadSdConfig(params: SdConfigParams): Promise<SdConfig> {
+  const sdConfigPath = path.resolve(params.cwd, "sd.config.ts");
+
+  if (!(await fsExists(sdConfigPath))) {
+    throw new SdError(`sd.config.ts file not found: ${sdConfigPath}`);
+  }
+
+  const jiti = createJiti(import.meta.url);
+  const sdConfigModule = await jiti.import(sdConfigPath);
+
+  if (
+    sdConfigModule == null ||
+    typeof sdConfigModule !== "object" ||
+    !("default" in sdConfigModule) ||
+    typeof sdConfigModule.default !== "function"
+  ) {
+    throw new SdError(`sd.config.ts must export a function as default: ${sdConfigPath}`);
+  }
+
+  const config = await sdConfigModule.default(params);
+
+  if (
+    config == null ||
+    typeof config !== "object" ||
+    !("packages" in config) ||
+    config.packages == null ||
+    typeof config.packages !== "object" ||
+    Array.isArray(config.packages)
+  ) {
+    throw new SdError(`sd.config.ts return value is not in the correct format: ${sdConfigPath}`);
+  }
+  return config as SdConfig;
+}

package/src/utils/tailwind-config-deps.ts

@@ -1,98 +1,98 @@
-import fs from "fs";
-import path from "path";
-
-const jsExtensions = [".js", ".cjs", ".mjs"];
-
-const jsResolutionOrder = ["", ".js", ".cjs", ".mjs", ".ts", ".cts", ".mts", ".jsx", ".tsx"];
-const tsResolutionOrder = ["", ".ts", ".cts", ".mts", ".tsx", ".js", ".cjs", ".mjs", ".jsx"];
-
-function resolveWithExtension(file: string, extensions: string[]): string | null {
-  for (const ext of extensions) {
-    const full = `${file}${ext}`;
-    if (fs.existsSync(full) && fs.statSync(full).isFile()) {
-      return full;
-    }
-  }
-  for (const ext of extensions) {
-    const full = `${file}/index${ext}`;
-    if (fs.existsSync(full) && fs.statSync(full).isFile()) {
-      return full;
-    }
-  }
-  return null;
-}
-
-function resolvePackageFile(specifier: string, fromDir: string): string | null {
-  const parts = specifier.split("/");
-  const pkgName = specifier.startsWith("@") ? parts.slice(0, 2).join("/") : parts[0];
-  const subPath = specifier.startsWith("@") ? parts.slice(2).join("/") : parts.slice(1).join("/");
-
-  let searchDir = fromDir;
-  while (true) {
-    const candidate = path.join(searchDir, "node_modules", pkgName);
-    if (fs.existsSync(candidate)) {
-      const realDir = fs.realpathSync(candidate);
-      if (subPath) {
-        return resolveWithExtension(path.join(realDir, subPath), tsResolutionOrder);
-      }
-      return resolveWithExtension(path.join(realDir, "index"), tsResolutionOrder);
-    }
-    const parent = path.dirname(searchDir);
-    if (parent === searchDir) break;
-    searchDir = parent;
-  }
-  return null;
-}
-
-/**
- * Recursively collect dependencies of Tailwind config file
- *
- * Tailwind built-in `getModuleDependencies` only tracks relative path imports,
- * but this function also resolves `node_modules` symlinks to track actual files for packages in specified scope.
- */
-export function getTailwindConfigDeps(configPath: string, replaceDeps: string[]): string[] {
-  const seen = new Set<string>();
-
-  function isReplaceDepImport(specifier: string): boolean {
-    return replaceDeps.some((dep) => specifier === dep || specifier.startsWith(dep + "/"));
-  }
-
-  function walk(absoluteFile: string): void {
-    if (seen.has(absoluteFile)) return;
-    if (!fs.existsSync(absoluteFile)) return;
-    seen.add(absoluteFile);
-
-    const base = path.dirname(absoluteFile);
-    const ext = path.extname(absoluteFile);
-    const extensions = jsExtensions.includes(ext) ? jsResolutionOrder : tsResolutionOrder;
-
-    let contents: string;
-    try {
-      contents = fs.readFileSync(absoluteFile, "utf-8");
-    } catch {
-      return;
-    }
-
-    for (const match of [
-      ...contents.matchAll(/import[\s\S]*?['"](.{3,}?)['"]/gi),
-      ...contents.matchAll(/import[\s\S]*from[\s\S]*?['"](.{3,}?)['"]/gi),
-      ...contents.matchAll(/require\(['"`](.+)['"`]\)/gi),
-    ]) {
-      const specifier = match[1];
-      let resolved: string | null = null;
-
-      if (specifier.startsWith(".")) {
-        resolved = resolveWithExtension(path.resolve(base, specifier), extensions);
-      } else if (isReplaceDepImport(specifier)) {
-        resolved = resolvePackageFile(specifier, base);
-      }
-
-      if (resolved != null) {
-        walk(resolved);
-      }
-    }
-  }
-
-  walk(path.resolve(configPath));
-  return [...seen];
-}
+import fs from "fs";
+import path from "path";
+
+const jsExtensions = [".js", ".cjs", ".mjs"];
+
+const jsResolutionOrder = ["", ".js", ".cjs", ".mjs", ".ts", ".cts", ".mts", ".jsx", ".tsx"];
+const tsResolutionOrder = ["", ".ts", ".cts", ".mts", ".tsx", ".js", ".cjs", ".mjs", ".jsx"];
+
+function resolveWithExtension(file: string, extensions: string[]): string | null {
+  for (const ext of extensions) {
+    const full = `${file}${ext}`;
+    if (fs.existsSync(full) && fs.statSync(full).isFile()) {
+      return full;
+    }
+  }
+  for (const ext of extensions) {
+    const full = `${file}/index${ext}`;
+    if (fs.existsSync(full) && fs.statSync(full).isFile()) {
+      return full;
+    }
+  }
+  return null;
+}
+
+function resolvePackageFile(specifier: string, fromDir: string): string | null {
+  const parts = specifier.split("/");
+  const pkgName = specifier.startsWith("@") ? parts.slice(0, 2).join("/") : parts[0];
+  const subPath = specifier.startsWith("@") ? parts.slice(2).join("/") : parts.slice(1).join("/");
+
+  let searchDir = fromDir;
+  while (true) {
+    const candidate = path.join(searchDir, "node_modules", pkgName);
+    if (fs.existsSync(candidate)) {
+      const realDir = fs.realpathSync(candidate);
+      if (subPath) {
+        return resolveWithExtension(path.join(realDir, subPath), tsResolutionOrder);
+      }
+      return resolveWithExtension(path.join(realDir, "index"), tsResolutionOrder);
+    }
+    const parent = path.dirname(searchDir);
+    if (parent === searchDir) break;
+    searchDir = parent;
+  }
+  return null;
+}
+
+/**
+ * Recursively collect dependencies of Tailwind config file
+ *
+ * Tailwind built-in `getModuleDependencies` only tracks relative path imports,
+ * but this function also resolves `node_modules` symlinks to track actual files for packages in specified scope.
+ */
+export function getTailwindConfigDeps(configPath: string, replaceDeps: string[]): string[] {
+  const seen = new Set<string>();
+
+  function isReplaceDepImport(specifier: string): boolean {
+    return replaceDeps.some((dep) => specifier === dep || specifier.startsWith(dep + "/"));
+  }
+
+  function walk(absoluteFile: string): void {
+    if (seen.has(absoluteFile)) return;
+    if (!fs.existsSync(absoluteFile)) return;
+    seen.add(absoluteFile);
+
+    const base = path.dirname(absoluteFile);
+    const ext = path.extname(absoluteFile);
+    const extensions = jsExtensions.includes(ext) ? jsResolutionOrder : tsResolutionOrder;
+
+    let contents: string;
+    try {
+      contents = fs.readFileSync(absoluteFile, "utf-8");
+    } catch {
+      return;
+    }
+
+    for (const match of [
+      ...contents.matchAll(/import[\s\S]*?['"](.{3,}?)['"]/gi),
+      ...contents.matchAll(/import[\s\S]*from[\s\S]*?['"](.{3,}?)['"]/gi),
+      ...contents.matchAll(/require\(['"`](.+)['"`]\)/gi),
+    ]) {
+      const specifier = match[1];
+      let resolved: string | null = null;
+
+      if (specifier.startsWith(".")) {
+        resolved = resolveWithExtension(path.resolve(base, specifier), extensions);
+      } else if (isReplaceDepImport(specifier)) {
+        resolved = resolvePackageFile(specifier, base);
+      }
+
+      if (resolved != null) {
+        walk(resolved);
+      }
+    }
+  }
+
+  walk(path.resolve(configPath));
+  return [...seen];
+}

package/src/utils/template.ts

@@ -1,56 +1,56 @@
-import path from "path";
-import Handlebars from "handlebars";
-import { fsCopy, fsMkdir, fsRead, fsReaddir, fsStat, fsWrite } from "@simplysm/core-node";
-
-/**
- * Recursively traverse template directory, render with Handlebars, and generate files
- *
- * - `.hbs` extension files: Compile with Handlebars → save with `.hbs` removed from name
- * - If `.hbs` result is empty string/whitespace only: skip file creation
- * - Other files: copy as-is (binary)
- *
- * @param srcDir - Template source directory
- * @param destDir - Output destination directory
- * @param context - Handlebars template variables
- * @param dirReplacements - Directory name substitution map (e.g., `{ __CLIENT__: "client-admin" }`)
- */
-export async function renderTemplateDir(
-  srcDir: string,
-  destDir: string,
-  context: Record<string, unknown>,
-  dirReplacements?: Record<string, string>,
-): Promise<void> {
-  await fsMkdir(destDir);
-
-  const entries = await fsReaddir(srcDir);
-
-  for (const entry of entries) {
-    const srcPath = path.join(srcDir, entry);
-    const stat = await fsStat(srcPath);
-
-    if (stat.isDirectory()) {
-      // Apply directory name substitution
-      const destName = dirReplacements?.[entry] ?? entry;
-      await renderTemplateDir(
-        path.join(srcDir, entry),
-        path.join(destDir, destName),
-        context,
-        dirReplacements,
-      );
-    } else if (entry.endsWith(".hbs")) {
-      // Render Handlebars template
-      const source = await fsRead(srcPath);
-      const template = Handlebars.compile(source, { noEscape: true });
-      const result = template(context);
-
-      // Skip file creation if result is empty or whitespace-only
-      if (result.trim().length === 0) continue;
-
-      const destFileName = entry.slice(0, -4); // Remove .hbs
-      await fsWrite(path.join(destDir, destFileName), result);
-    } else {
-      // Copy binary files as-is
-      await fsCopy(srcPath, path.join(destDir, entry));
-    }
-  }
-}
+import path from "path";
+import Handlebars from "handlebars";
+import { fsCopy, fsMkdir, fsRead, fsReaddir, fsStat, fsWrite } from "@simplysm/core-node";
+
+/**
+ * Recursively traverse template directory, render with Handlebars, and generate files
+ *
+ * - `.hbs` extension files: Compile with Handlebars → save with `.hbs` removed from name
+ * - If `.hbs` result is empty string/whitespace only: skip file creation
+ * - Other files: copy as-is (binary)
+ *
+ * @param srcDir - Template source directory
+ * @param destDir - Output destination directory
+ * @param context - Handlebars template variables
+ * @param dirReplacements - Directory name substitution map (e.g., `{ __CLIENT__: "client-admin" }`)
+ */
+export async function renderTemplateDir(
+  srcDir: string,
+  destDir: string,
+  context: Record<string, unknown>,
+  dirReplacements?: Record<string, string>,
+): Promise<void> {
+  await fsMkdir(destDir);
+
+  const entries = await fsReaddir(srcDir);
+
+  for (const entry of entries) {
+    const srcPath = path.join(srcDir, entry);
+    const stat = await fsStat(srcPath);
+
+    if (stat.isDirectory()) {
+      // Apply directory name substitution
+      const destName = dirReplacements?.[entry] ?? entry;
+      await renderTemplateDir(
+        path.join(srcDir, entry),
+        path.join(destDir, destName),
+        context,
+        dirReplacements,
+      );
+    } else if (entry.endsWith(".hbs")) {
+      // Render Handlebars template
+      const source = await fsRead(srcPath);
+      const template = Handlebars.compile(source, { noEscape: true });
+      const result = template(context);
+
+      // Skip file creation if result is empty or whitespace-only
+      if (result.trim().length === 0) continue;
+
+      const destFileName = entry.slice(0, -4); // Remove .hbs
+      await fsWrite(path.join(destDir, destFileName), result);
+    } else {
+      // Copy binary files as-is
+      await fsCopy(srcPath, path.join(destDir, entry));
+    }
+  }
+}

package/src/utils/tsconfig.ts

@@ -1,127 +1,127 @@
-import ts from "typescript";
-import path from "path";
-import { fsExists, fsReadJson, pathIsChildPath } from "@simplysm/core-node";
-import { SdError } from "@simplysm/core-common";
-
-/**
- * DOM-related lib patterns - libs that include browser APIs
- * Used when filtering libs that should be excluded from node environment (lib.dom.d.ts, lib.webworker.d.ts, etc)
- */
-const DOM_LIB_PATTERNS = ["dom", "webworker"] as const;
-
-/**
- * Read @types/* devDependencies from package.json and return types list
- */
-export async function getTypesFromPackageJson(packageDir: string): Promise<string[]> {
-  const packageJsonPath = path.join(packageDir, "package.json");
-  if (!(await fsExists(packageJsonPath))) {
-    return [];
-  }
-
-  const packageJson = await fsReadJson<{ devDependencies?: Record<string, string> }>(
-    packageJsonPath,
-  );
-  const devDeps = packageJson.devDependencies ?? {};
-
-  return Object.keys(devDeps)
-    .filter((dep) => dep.startsWith("@types/"))
-    .map((dep) => dep.replace("@types/", ""));
-}
-
-/**
- * Type check environment
- * - node: remove DOM lib + add node types
- * - browser: remove node types
- * - neutral: keep DOM lib + add node types (for Node/browser shared packages)
- */
-export type TypecheckEnv = "node" | "browser" | "neutral";
-
-/**
- * Create compiler options for package
- *
- * @param baseOptions - Compiler options from root tsconfig
- * @param env - Type check environment (node: remove DOM lib + add node types, browser: remove node types)
- * @param packageDir - Package directory path
- *
- * @remarks
- * The types option ignores baseOptions.types and is newly constructed per package.
- * This is because the global types in root tsconfig may not fit the package environment.
- * (e.g., prevent node types from being included in browser packages)
- */
-export async function getCompilerOptionsForPackage(
-  baseOptions: ts.CompilerOptions,
-  env: TypecheckEnv,
-  packageDir: string,
-): Promise<ts.CompilerOptions> {
-  const options = { ...baseOptions };
-  const packageTypes = await getTypesFromPackageJson(packageDir);
-
-  // pnpm environment: search both package-specific node_modules/@types and root node_modules/@types
-  options.typeRoots = [
-    path.join(packageDir, "node_modules", "@types"),
-    path.join(process.cwd(), "node_modules", "@types"),
-  ];
-
-  switch (env) {
-    case "node":
-      options.lib = options.lib?.filter(
-        (lib) => !DOM_LIB_PATTERNS.some((pattern) => lib.toLowerCase().includes(pattern)),
-      );
-      options.types = [...new Set([...packageTypes, "node"])];
-      break;
-    case "browser":
-      options.types = packageTypes.filter((t) => t !== "node");
-      break;
-    case "neutral":
-      options.types = [...new Set([...packageTypes, "node"])];
-      break;
-  }
-
-  return options;
-}
-
-/**
- * Parse root tsconfig
- * @throws If unable to read or parse tsconfig.json
- */
-export function parseRootTsconfig(cwd: string): ts.ParsedCommandLine {
-  const tsconfigPath = path.join(cwd, "tsconfig.json");
-  const configFile = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
-
-  if (configFile.error) {
-    const message = ts.flattenDiagnosticMessageText(configFile.error.messageText, "\n");
-    throw new SdError(`Failed to read tsconfig.json: ${message}`);
-  }
-
-  const parsed = ts.parseJsonConfigFileContent(configFile.config, ts.sys, cwd);
-
-  if (parsed.errors.length > 0) {
-    const messages = parsed.errors.map((e) => ts.flattenDiagnosticMessageText(e.messageText, "\n"));
-    throw new SdError(`Failed to parse tsconfig.json: ${messages.join("; ")}`);
-  }
-
-  return parsed;
-}
-
-/**
- * Get list of package source files (based on tsconfig)
- */
-export function getPackageSourceFiles(
-  pkgDir: string,
-  parsedConfig: ts.ParsedCommandLine,
-): string[] {
-  const pkgSrcDir = path.join(pkgDir, "src");
-  return parsedConfig.fileNames.filter((f) => pathIsChildPath(f, pkgSrcDir));
-}
-
-/**
- * Get full list of package files (including src + tests)
- */
-export function getPackageFiles(pkgDir: string, parsedConfig: ts.ParsedCommandLine): string[] {
-  return parsedConfig.fileNames.filter((f) => {
-    if (!pathIsChildPath(f, pkgDir)) return false;
-    // Exclude files directly in package root (config files) — treated same as project root files in other tasks
-    const relative = path.relative(pkgDir, f);
-    return path.dirname(relative) !== ".";
-  });
-}
+import ts from "typescript";
+import path from "path";
+import { fsExists, fsReadJson, pathIsChildPath } from "@simplysm/core-node";
+import { SdError } from "@simplysm/core-common";
+
+/**
+ * DOM-related lib patterns - libs that include browser APIs
+ * Used when filtering libs that should be excluded from node environment (lib.dom.d.ts, lib.webworker.d.ts, etc)
+ */
+const DOM_LIB_PATTERNS = ["dom", "webworker"] as const;
+
+/**
+ * Read @types/* devDependencies from package.json and return types list
+ */
+export async function getTypesFromPackageJson(packageDir: string): Promise<string[]> {
+  const packageJsonPath = path.join(packageDir, "package.json");
+  if (!(await fsExists(packageJsonPath))) {
+    return [];
+  }
+
+  const packageJson = await fsReadJson<{ devDependencies?: Record<string, string> }>(
+    packageJsonPath,
+  );
+  const devDeps = packageJson.devDependencies ?? {};
+
+  return Object.keys(devDeps)
+    .filter((dep) => dep.startsWith("@types/"))
+    .map((dep) => dep.replace("@types/", ""));
+}
+
+/**
+ * Type check environment
+ * - node: remove DOM lib + add node types
+ * - browser: remove node types
+ * - neutral: keep DOM lib + add node types (for Node/browser shared packages)
+ */
+export type TypecheckEnv = "node" | "browser" | "neutral";
+
+/**
+ * Create compiler options for package
+ *
+ * @param baseOptions - Compiler options from root tsconfig
+ * @param env - Type check environment (node: remove DOM lib + add node types, browser: remove node types)
+ * @param packageDir - Package directory path
+ *
+ * @remarks
+ * The types option ignores baseOptions.types and is newly constructed per package.
+ * This is because the global types in root tsconfig may not fit the package environment.
+ * (e.g., prevent node types from being included in browser packages)
+ */
+export async function getCompilerOptionsForPackage(
+  baseOptions: ts.CompilerOptions,
+  env: TypecheckEnv,
+  packageDir: string,
+): Promise<ts.CompilerOptions> {
+  const options = { ...baseOptions };
+  const packageTypes = await getTypesFromPackageJson(packageDir);
+
+  // pnpm environment: search both package-specific node_modules/@types and root node_modules/@types
+  options.typeRoots = [
+    path.join(packageDir, "node_modules", "@types"),
+    path.join(process.cwd(), "node_modules", "@types"),
+  ];
+
+  switch (env) {
+    case "node":
+      options.lib = options.lib?.filter(
+        (lib) => !DOM_LIB_PATTERNS.some((pattern) => lib.toLowerCase().includes(pattern)),
+      );
+      options.types = [...new Set([...packageTypes, "node"])];
+      break;
+    case "browser":
+      options.types = packageTypes.filter((t) => t !== "node");
+      break;
+    case "neutral":
+      options.types = [...new Set([...packageTypes, "node"])];
+      break;
+  }
+
+  return options;
+}
+
+/**
+ * Parse root tsconfig
+ * @throws If unable to read or parse tsconfig.json
+ */
+export function parseRootTsconfig(cwd: string): ts.ParsedCommandLine {
+  const tsconfigPath = path.join(cwd, "tsconfig.json");
+  const configFile = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
+
+  if (configFile.error) {
+    const message = ts.flattenDiagnosticMessageText(configFile.error.messageText, "\n");
+    throw new SdError(`Failed to read tsconfig.json: ${message}`);
+  }
+
+  const parsed = ts.parseJsonConfigFileContent(configFile.config, ts.sys, cwd);
+
+  if (parsed.errors.length > 0) {
+    const messages = parsed.errors.map((e) => ts.flattenDiagnosticMessageText(e.messageText, "\n"));
+    throw new SdError(`Failed to parse tsconfig.json: ${messages.join("; ")}`);
+  }
+
+  return parsed;
+}
+
+/**
+ * Get list of package source files (based on tsconfig)
+ */
+export function getPackageSourceFiles(
+  pkgDir: string,
+  parsedConfig: ts.ParsedCommandLine,
+): string[] {
+  const pkgSrcDir = path.join(pkgDir, "src");
+  return parsedConfig.fileNames.filter((f) => pathIsChildPath(f, pkgSrcDir));
+}
+
+/**
+ * Get full list of package files (including src + tests)
+ */
+export function getPackageFiles(pkgDir: string, parsedConfig: ts.ParsedCommandLine): string[] {
+  return parsedConfig.fileNames.filter((f) => {
+    if (!pathIsChildPath(f, pkgDir)) return false;
+    // Exclude files directly in package root (config files) — treated same as project root files in other tasks
+    const relative = path.relative(pkgDir, f);
+    return path.dirname(relative) !== ".";
+  });
+}