teamix-evo 0.14.2 → 0.15.0

package/dist/index.js

@@ -5059,8 +5059,7 @@ var DEFAULT_UI_ALIASES = {
   hooks: "src/hooks",
   utils: "src/lib/utils",
   lib: "src/lib",
-  business: "src/components/business",
-  blocks: "src/blocks"
+  business: "src/components/business"
 };
 var DEFAULT_UI_ICON_LIBRARY = "lucide";
 async function runUiInit(options) {
@@ -5076,8 +5075,7 @@ async function runUiInit(options) {
     hooks: options.aliases?.hooks ?? DEFAULT_UI_ALIASES.hooks,
     utils: options.aliases?.utils ?? DEFAULT_UI_ALIASES.utils,
     lib: options.aliases?.lib ?? DEFAULT_UI_ALIASES.lib,
-    business: options.aliases?.business ?? DEFAULT_UI_ALIASES.business,
-    blocks: options.aliases?.blocks ?? DEFAULT_UI_ALIASES.blocks
+    business: options.aliases?.business ?? DEFAULT_UI_ALIASES.business
   };
   const iconLibrary = options.iconLibrary ?? DEFAULT_UI_ICON_LIBRARY;
   const tsx = options.tsx ?? true;
@@ -5169,8 +5167,7 @@ async function resolveConfig(opts) {
         hooks: opts.hooks ?? DEFAULT_UI_ALIASES.hooks,
         utils: opts.utils ?? DEFAULT_UI_ALIASES.utils,
         lib: opts.lib ?? DEFAULT_UI_ALIASES.lib,
-        business: DEFAULT_UI_ALIASES.business,
-        blocks: DEFAULT_UI_ALIASES.blocks
+        business: DEFAULT_UI_ALIASES.business
       },
       iconLibrary: opts.iconLibrary ?? "lucide",
       tsx: opts.tsx ?? true,
@@ -5218,8 +5215,7 @@ async function resolveConfig(opts) {
       hooks,
       utils,
       lib,
-      business: DEFAULT_UI_ALIASES.business,
-      blocks: DEFAULT_UI_ALIASES.blocks
+      business: DEFAULT_UI_ALIASES.business
     },
     iconLibrary,
     tsx: tsxAns,
@@ -5274,8 +5270,7 @@ var SOURCE_ROOT_TO_ALIAS_KEY = {
   components: "components",
   hooks: "hooks",
   utils: "utils",
-  lib: "lib",
-  blocks: "blocks"
+  lib: "lib"
 };
 function rewriteImports(source, aliases, opts) {
   const shouldFlatten = opts?.flatten !== false;
@@ -5284,7 +5279,7 @@ function rewriteImports(source, aliases, opts) {
     (full, quote, root, rest) => {
       const aliasKey = SOURCE_ROOT_TO_ALIAS_KEY[root];
       if (!aliasKey) return full;
-      const alias = aliases[aliasKey];
+      const alias = aliases[aliasKey] ?? `src/${root}`;
       const normalized = aliasToImportPath(alias);
       const resolvedRest = shouldFlatten ? flattenRestPath(rest) : rest ?? "";
       return `${quote}${normalized}${resolvedRest}${quote}`;
@@ -6042,13 +6037,11 @@ import * as fs22 from "fs/promises";
 import * as path27 from "path";
 var PACKAGE_NAME = {
   ui: "@teamix-evo/ui",
-  "biz-ui": "@teamix-evo/biz-ui",
-  blocks: "@teamix-evo/blocks"
+  "biz-ui": "@teamix-evo/biz-ui"
 };
 var ALIAS_KEY = {
   ui: "components",
-  "biz-ui": "business",
-  blocks: "blocks"
+  "biz-ui": "business"
 };
 var COMPONENT_FILE_RE = /\.(tsx|ts)$/;
 var SKIP_FILENAMES = /* @__PURE__ */ new Set(["index.ts", "index.tsx"]);
@@ -6064,7 +6057,7 @@ async function detectComponentLineage(options) {
   );
   const installedPkg = findInstalledPackage(installed, PACKAGE_NAME[category]);
   const registeredIds = installedPkg ? extractIds(installedPkg).sort() : [];
-  const layout = category === "blocks" ? "directory" : "flat";
+  const layout = "flat";
   const onDiskIds = installDirExists ? await listComponentIds(installDirAbs, layout) : [];
   const registeredSet = new Set(registeredIds);
   const unregisteredIds = onDiskIds.filter((id) => !registeredSet.has(id)).sort();
@@ -6089,7 +6082,7 @@ async function detectComponentLineage(options) {
 function resolveInstallDir(category, config) {
   const aliasMap = config?.packages?.ui?.aliases ?? config?.packages?.["biz-ui"]?.aliases ?? DEFAULT_UI_ALIASES;
   const key = ALIAS_KEY[category];
-  return aliasMap[key] ?? DEFAULT_UI_ALIASES[key];
+  return aliasMap[key] ?? DEFAULT_UI_ALIASES[key] ?? "src/blocks";
 }
 function extractIds(pkg) {
   const ids = /* @__PURE__ */ new Set();
@@ -6143,8 +6136,7 @@ var TEAMIX_DIR4 = ".teamix-evo";
 var STAGING_DIR = ".upgrade-staging";
 var PACKAGE_NAME2 = {
   ui: "@teamix-evo/ui",
-  "biz-ui": "@teamix-evo/biz-ui",
-  blocks: "@teamix-evo/blocks"
+  "biz-ui": "@teamix-evo/biz-ui"
 };
 function isoToFsSafe2(iso) {
   return iso.replace(/[:.]/g, "-");
@@ -6669,7 +6661,7 @@ async function runUiUpgrade(options) {
   const { projectRoot, category, ids = [], trigger } = options;
   const config = await readProjectConfig(projectRoot);
   if (!config) return { status: "not-initialized" };
-  const cfgKey = category === "blocks" ? "blocks" : category === "ui" ? "ui" : "biz-ui";
+  const cfgKey = category === "ui" ? "ui" : "biz-ui";
   if (!config.packages?.[cfgKey]) {
     return { status: "not-installed", detail: `${category} not installed` };
   }
@@ -6733,21 +6725,6 @@ async function runUiUpgrade(options) {
 }
 async function buildStaging(args) {
   const { category, projectRoot, aliases, lineageReport, trigger, onlyIds } = args;
-  if (category === "blocks") {
-    const root = args.blocksPackageRoot ?? resolvePackageRoot4("@teamix-evo/blocks");
-    const manifest = await loadUiPackageManifest3(root);
-    manifest.version = await readPkgVersion(root);
-    return buildUiUpgradeStaging({
-      projectRoot,
-      category,
-      manifest,
-      packageRoot: root,
-      aliases,
-      lineageReport,
-      trigger,
-      onlyIds
-    });
-  }
   if (category === "ui") {
     const root = args.uiPackageRoot ?? resolvePackageRoot4("@teamix-evo/ui");
     const manifest = await loadUiPackageManifest3(root);
@@ -6822,12 +6799,6 @@ var META = {
     installDirHint: "src/components/business",
     notInstalledHint: "npx teamix-evo biz-ui add <id>",
     trigger: "biz-ui-upgrade"
-  },
-  blocks: {
-    category: "blocks",
-    installDirHint: "src/blocks",
-    notInstalledHint: "npx teamix-evo blocks add <id>",
-    trigger: "blocks-upgrade"
   }
 };
 function makeUpgradeCommand(category) {
@@ -7836,6 +7807,12 @@ async function runVariantUiAdd(packageName, options) {
   if (idx >= 0) installed.installed[idx] = entry;
   else installed.installed.push(entry);
   await writeInstalledManifest(projectRoot, installed);
+  config.packages[packageName] = {
+    ...config.packages[packageName] ?? {},
+    variant,
+    version: packageVersion
+  };
+  await writeProjectConfig(projectRoot, config);
   return {
     packageName: fullPackageName,
     variant,
@@ -8070,11 +8047,12 @@ async function runBlocksAdd(options) {
   ) ?? { schemaVersion: 1, installed: [] };
   const idx = installed.installed.findIndex((p2) => p2.package === packageName);
   const prior = idx >= 0 ? installed.installed[idx] : null;
+  const aliases = { ...uiCfg.aliases, blocks: uiCfg.aliases.blocks ?? "src/blocks" };
   const result = await installUiEntries({
     projectRoot,
     manifest,
     packageRoot,
-    aliases: uiCfg.aliases,
+    aliases,
     requested: ids,
     skipExisting: !overwrite,
     flatten: false,
@@ -8210,16 +8188,12 @@ var listCommand5 = new Command32("list").description("\u5217\u51FA @teamix-evo/b
   }
 );
 
-// src/commands/blocks/update.ts
-var updateCommand5 = makeUpgradeCommand("blocks");
-
 // src/commands/blocks/index.ts
 var blocksCommand = new Command33("blocks").description(
   "\u7BA1\u7406 marketing blocks\uFF08\u6E90\u7801\u6CE8\u5165\u5F0F\u5B89\u88C5\uFF0Ctoken \u9A71\u52A8\u6362\u80A4\uFF09"
 );
 blocksCommand.addCommand(addCommand4);
 blocksCommand.addCommand(listCommand5);
-blocksCommand.addCommand(updateCommand5);
 
 // src/commands/lint/index.ts
 import { Command as Command35 } from "commander";
@@ -9480,8 +9454,8 @@ function summarizeInstalled(manifest) {
     entries
   };
 }
-var updateCommand6 = new Command37("update").description(
-  "Teamix Evo \u5957\u4EF6\u66F4\u65B0\uFF08tokens / skills / ui / biz-ui / blocks \u7248\u672C\u68C0\u6D4B + staging \u751F\u6210\uFF09"
+var updateCommand5 = new Command37("update").description(
+  "Teamix Evo \u5957\u4EF6\u66F4\u65B0\uFF08tokens / skills / ui / biz-ui \u7248\u672C\u68C0\u6D4B + staging \u751F\u6210\uFF09"
 ).option("--cwd <dir>", "\u6307\u5B9A\u5DE5\u7A0B\u6839\u76EE\u5F55\uFF08\u9ED8\u8BA4\uFF1A\u5F53\u524D\u76EE\u5F55\uFF09").option("--json", "\u8F93\u51FA JSON \u683C\u5F0F\u7684\u66F4\u65B0\u62A5\u544A\uFF08\u4F9B AI skill \u6D88\u8D39\uFF09").action(async (opts) => {
   const cwd = path40.resolve(opts.cwd ?? process.cwd());
   try {
@@ -9503,7 +9477,7 @@ var updateCommand6 = new Command37("update").description(
       installed: summary,
       lint: lintVersions,
       agentsMd: agentsMdStatus,
-      hint: "\u4F7F\u7528 teamix-evo-manage skill \u5F15\u5BFC\u6267\u884C\u66F4\u65B0\u8BA1\u5212\uFF0C\u6216\u624B\u52A8\u8C03\u7528\u5B50\u547D\u4EE4\uFF1Atokens update / skills update / ui update / biz-ui update / blocks update"
+      hint: "\u4F7F\u7528 teamix-evo-manage skill \u5F15\u5BFC\u6267\u884C\u66F4\u65B0\u8BA1\u5212\uFF0C\u6216\u624B\u52A8\u8C03\u7528\u5B50\u547D\u4EE4\uFF1Atokens update / skills update / ui update / biz-ui update"
     };
     if (opts.json) {
       console.log(JSON.stringify(report, null, 2));
@@ -9524,7 +9498,7 @@ var updateCommand6 = new Command37("update").description(
         "\u8BF7\u5728 AI IDE \u4E2D\u89E6\u53D1 teamix-evo-manage skill \u4EE5\u5F15\u5BFC\u66F4\u65B0\u8BA1\u5212\u3002"
       );
       logger.info(
-        "\u6216\u624B\u52A8\u8C03\u7528\u5B50\u547D\u4EE4\uFF1Atokens update / skills update / ui update / biz-ui update / blocks update"
+        "\u6216\u624B\u52A8\u8C03\u7528\u5B50\u547D\u4EE4\uFF1Atokens update / skills update / ui update / biz-ui update"
       );
     }
   } catch (err) {
@@ -10292,7 +10266,7 @@ program.addCommand(bizUiCommand);
 program.addCommand(blocksCommand);
 program.addCommand(lintCommand);
 program.addCommand(initCommand5);
-program.addCommand(updateCommand6);
+program.addCommand(updateCommand5);
 program.addCommand(migrateCommand);
 program.addCommand(restoreCommand);
 program.addCommand(switchCommand);