@h-ai/cli 0.1.0-alpha.10 → 0.1.0-alpha.11

package/dist/index.js

@@ -2,18 +2,19 @@
 import { generateConfigFile } from './chunk-LANIDJC7.js';
 import './chunk-YV7WPUI6.js';
 import './chunk-2H7UOFLK.js';
+import { readFileSync, existsSync } from 'fs';
+import path2, { resolve } from 'path';
 import process3 from 'process';
+import { fileURLToPath } from 'url';
 import { core } from '@h-ai/core';
 import { cac } from 'cac';
 import chalk from 'chalk';
-import path2, { resolve } from 'path';
+import { createRequire } from 'module';
 import fse from 'fs-extra';
 import ora from 'ora';
 import prompts from 'prompts';
 import Handlebars from 'handlebars';
-import { execSync } from 'child_process';
-import { fileURLToPath } from 'url';
-import { existsSync, readFileSync } from 'fs';
+import { execSync, execFileSync } from 'child_process';
 import { parse } from 'yaml';
 
 var CAMEL_CASE_SEPARATOR_REGEX = /[-_\s]+(.)?/g;
@@ -79,6 +80,9 @@ function registerHelpers() {
   });
 }
 registerHelpers();
+Handlebars.registerHelper("if_eq", function(a, b, options) {
+  return a === b ? options.fn(this) : options.inverse(this);
+});
 var FEATURE_ROUTE_DIRS = {
   iam: ["routes-shared"],
   storage: ["routes"],
@@ -255,6 +259,8 @@ async function renderHbsInDir(dir, destRoot, context) {
 }
 
 // src/commands/create.ts
+var RE_HTTPS_URL = /^https:\/\/.+/;
+var RE_GIT_SSH_URL = /^git@.+:.+/;
 var APP_TYPES = {
   "admin": {
     name: "\u7BA1\u7406\u540E\u53F0",
@@ -497,6 +503,14 @@ async function createProject(options) {
     if (resolvedOptions.git) {
       spinner.start("\u521D\u59CB\u5316 Git \u4ED3\u5E93...");
       execSync("git init", { cwd: projectPath, stdio: "ignore" });
+      if (resolvedOptions.gitRemote) {
+        const gitRemote = resolvedOptions.gitRemote;
+        if (!RE_HTTPS_URL.test(gitRemote) && !RE_GIT_SSH_URL.test(gitRemote)) {
+          spinner.fail();
+          throw new Error(`Invalid gitRemote URL: ${gitRemote}`);
+        }
+        execFileSync("git", ["remote", "add", "origin", gitRemote], { cwd: projectPath, stdio: "ignore" });
+      }
       spinner.succeed();
     }
     if (resolvedOptions.install) {
@@ -639,6 +653,23 @@ async function resolveOptions(options) {
     }, { onCancel });
     git = initGit;
   }
+  let gitRemote = options.gitRemote;
+  if (git && gitRemote === void 0) {
+    const { remote } = await prompts({
+      type: "text",
+      name: "remote",
+      message: "Git \u4ED3\u5E93\u5730\u5740 (\u53EF\u9009\uFF0C\u56DE\u8F66\u8DF3\u8FC7):",
+      initial: "",
+      validate: (value) => {
+        if (!value.trim())
+          return true;
+        if (RE_HTTPS_URL.test(value) || RE_GIT_SSH_URL.test(value))
+          return true;
+        return "\u8BF7\u8F93\u5165\u5408\u6CD5\u7684 Git \u4ED3\u5E93\u5730\u5740 (https://... \u6216 git@...:...)";
+      }
+    }, { onCancel });
+    gitRemote = remote?.trim() || "";
+  }
   return {
     name: projectName,
     appType: selectedAppType,
@@ -649,17 +680,25 @@ async function resolveOptions(options) {
     install: install ?? true,
     packageManager: packageManager || "pnpm",
     git: git ?? true,
+    gitRemote: gitRemote ?? "",
     verbose: options.verbose ?? false,
     cwd: options.cwd ?? "."
   };
 }
 function resolveFeatureDependencies(features) {
   const result = new Set(features);
-  for (const featureId of features) {
-    const feature = FEATURES[featureId];
-    if (feature?.dependencies) {
-      for (const dep of feature.dependencies) {
-        result.add(dep);
+  let changed = true;
+  while (changed) {
+    changed = false;
+    for (const featureId of result) {
+      const feature = FEATURES[featureId];
+      if (feature?.dependencies) {
+        for (const dep of feature.dependencies) {
+          if (!result.has(dep)) {
+            result.add(dep);
+            changed = true;
+          }
+        }
       }
     }
   }
@@ -999,9 +1038,12 @@ async function addModule(options) {
     const pkg = await fse.readJson(pkgPath);
     if (!pkg.dependencies)
       pkg.dependencies = {};
+    const require2 = createRequire(import.meta.url);
+    const cliPkg = require2("../../package.json");
+    const depVersion = `^${cliPkg.version}`;
     for (const pkgName of allPackages) {
       if (!pkg.dependencies[pkgName]) {
-        pkg.dependencies[pkgName] = "workspace:*";
+        pkg.dependencies[pkgName] = depVersion;
       }
     }
     await fse.writeJson(pkgPath, pkg, { spaces: 2 });
@@ -1551,11 +1593,21 @@ async function initProject(options) {
 }
 
 // src/index.ts
-var VERSION = "0.0.1";
+function readCliVersion() {
+  try {
+    const here = path2.dirname(fileURLToPath(import.meta.url));
+    const pkgPath = path2.resolve(here, "../package.json");
+    const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+    return pkg.version ?? "0.0.0";
+  } catch {
+    return "0.0.0";
+  }
+}
+var VERSION = readCliVersion();
 var cli = cac("hai");
 cli.option("-v, --verbose", "\u663E\u793A\u8BE6\u7EC6\u8F93\u51FA");
 cli.option("-C, --cwd <path>", "\u5DE5\u4F5C\u76EE\u5F55");
-cli.command("create [name]", "\u521B\u5EFA\u65B0\u7684 hai \u9879\u76EE").option("--type <type>", "\u5E94\u7528\u7C7B\u578B (admin, website, h5, api)").option("-t, --template <template>", "\u9879\u76EE\u6A21\u677F (minimal, default, full, custom)").option("-f, --features <features>", "\u529F\u80FD\u5217\u8868 (\u9017\u53F7\u5206\u9694: iam,db,cache,ai,storage,crypto)").option("--examples", "\u6DFB\u52A0\u793A\u4F8B\u4EE3\u7801").option("--no-examples", "\u4E0D\u6DFB\u52A0\u793A\u4F8B\u4EE3\u7801").option("--no-install", "\u4E0D\u5B89\u88C5\u4F9D\u8D56").option("-p, --package-manager <pm>", "\u5305\u7BA1\u7406\u5668 (pnpm, npm, yarn)").option("--no-git", "\u4E0D\u521D\u59CB\u5316 Git").action(async (name, options) => {
+cli.command("create [name]", "\u521B\u5EFA\u65B0\u7684 hai \u9879\u76EE").option("--type <type>", "\u5E94\u7528\u7C7B\u578B (admin, website, h5, api)").option("-t, --template <template>", "\u9879\u76EE\u6A21\u677F (minimal, default, full, custom)").option("-f, --features <features>", "\u529F\u80FD\u5217\u8868 (\u9017\u53F7\u5206\u9694: iam,db,cache,ai,storage,crypto)").option("--examples", "\u6DFB\u52A0\u793A\u4F8B\u4EE3\u7801").option("--no-examples", "\u4E0D\u6DFB\u52A0\u793A\u4F8B\u4EE3\u7801").option("--no-install", "\u4E0D\u5B89\u88C5\u4F9D\u8D56").option("-p, --package-manager <pm>", "\u5305\u7BA1\u7406\u5668 (pnpm, npm, yarn)").option("--no-git", "\u4E0D\u521D\u59CB\u5316 Git").option("--git-remote <url>", "Git \u8FDC\u7A0B\u4ED3\u5E93\u5730\u5740").action(async (name, options) => {
   try {
     const features = typeof options.features === "string" ? options.features.split(",").map((f) => f.trim()) : void 0;
     await createProject({
@@ -1567,6 +1619,7 @@ cli.command("create [name]", "\u521B\u5EFA\u65B0\u7684 hai \u9879\u76EE").option
       install: options.install,
       packageManager: options.packageManager,
       git: options.git,
+      gitRemote: options.gitRemote,
       verbose: options.verbose,
       cwd: options.cwd
     });