@farris/cli 2.1.8 → 2.2.0-beta.1

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 (109) hide show
  1. package/bin/index.js +1 -1
  2. package/lib/commands/build-components.js +48 -39
  3. package/lib/commands/build-components.js.map +1 -1
  4. package/lib/commands/build-css.js +38 -38
  5. package/lib/commands/build-css.js.map +1 -1
  6. package/lib/commands/build-lib.js +25 -25
  7. package/lib/commands/build-lib.js.map +1 -1
  8. package/lib/commands/build.js +15 -14
  9. package/lib/commands/build.js.map +1 -1
  10. package/lib/commands/create-app.js +54 -54
  11. package/lib/commands/dev-serve.js +18 -18
  12. package/lib/commands/extract-i18n.js +74 -74
  13. package/lib/commands/extract-i18n.js.map +1 -1
  14. package/lib/commands/preview-serve.js +16 -16
  15. package/lib/common/component-file-name.js +4 -0
  16. package/lib/common/component-file-name.js.map +1 -0
  17. package/lib/common/constant.js +22 -64
  18. package/lib/common/constant.js.map +1 -1
  19. package/lib/common/generate-app.js +51 -44
  20. package/lib/common/generate-app.js.map +1 -1
  21. package/lib/common/get-dependencies.js +9 -9
  22. package/lib/common/get-farris-config.js +25 -11
  23. package/lib/common/get-farris-config.js.map +1 -1
  24. package/lib/common/get-version.js +6 -6
  25. package/lib/common/get-vite-config.js +49 -105
  26. package/lib/common/get-vite-config.js.map +1 -1
  27. package/lib/common/lib-package-exports.js +21 -0
  28. package/lib/common/lib-package-exports.js.map +1 -0
  29. package/lib/common/list-lib-components.js +24 -0
  30. package/lib/common/list-lib-components.js.map +1 -0
  31. package/lib/common/template-manifest.js +17 -0
  32. package/lib/common/template-manifest.js.map +1 -0
  33. package/lib/config/vite-app.js +13 -13
  34. package/lib/config/vite-common.js +20 -20
  35. package/lib/config/vite-common.js.map +1 -1
  36. package/lib/config/vite-component.js +32 -30
  37. package/lib/config/vite-component.js.map +1 -1
  38. package/lib/config/vite-lib.js +26 -26
  39. package/lib/index.js +87 -175
  40. package/lib/index.js.map +1 -1
  41. package/lib/plugins/create-component-style.js +44 -44
  42. package/lib/plugins/create-package-json.js +48 -33
  43. package/lib/plugins/create-package-json.js.map +1 -1
  44. package/lib/plugins/dts.js +8 -8
  45. package/lib/plugins/html-system.js +9 -9
  46. package/lib/plugins/replace.js +17 -17
  47. package/lib/plugins/systemjs-bundle.js +15 -15
  48. package/lib/plugins/systemjs-bundle.js.map +1 -1
  49. package/package.json +9 -11
  50. package/templates/lib/.changeset/README.md +1 -0
  51. package/templates/lib/.changeset/config.json +11 -0
  52. package/templates/lib/README.md +17 -0
  53. package/templates/lib/components/button/index.ts +7 -0
  54. package/templates/lib/components/button/src/button.scss +10 -0
  55. package/templates/lib/components/button/src/button.vue +12 -0
  56. package/templates/lib/components/common/with-install.ts +9 -0
  57. package/templates/lib/components/index.ts +10 -0
  58. package/templates/lib/farris.config.mjs +13 -0
  59. package/templates/lib/package.json +21 -0
  60. package/templates/lib/tsconfig.json +7 -0
  61. package/templates/mobile/.changeset/README.md +4 -0
  62. package/templates/mobile/.changeset/config.json +11 -0
  63. package/templates/mobile/package.json +4 -1
  64. package/templates/web/.changeset/README.md +4 -0
  65. package/templates/web/.changeset/config.json +11 -0
  66. package/templates/web/package.json +4 -1
  67. package/lib/commands/generate/api.js +0 -188
  68. package/lib/commands/generate/api.js.map +0 -1
  69. package/lib/commands/generate/common.js +0 -101
  70. package/lib/commands/generate/common.js.map +0 -1
  71. package/lib/commands/generate/component.js +0 -164
  72. package/lib/commands/generate/component.js.map +0 -1
  73. package/lib/commands/generate/view.js +0 -198
  74. package/lib/commands/generate/view.js.map +0 -1
  75. package/lib/commands/workspace/add-app.js +0 -181
  76. package/lib/commands/workspace/add-app.js.map +0 -1
  77. package/lib/commands/workspace/create.js +0 -380
  78. package/lib/commands/workspace/create.js.map +0 -1
  79. package/lib/commands/workspace/inspect.js +0 -31
  80. package/lib/commands/workspace/inspect.js.map +0 -1
  81. package/lib/commands/workspace/verify.js +0 -39
  82. package/lib/commands/workspace/verify.js.map +0 -1
  83. package/lib/common/output.js +0 -95
  84. package/lib/common/output.js.map +0 -1
  85. package/lib/common/safety.js +0 -172
  86. package/lib/common/safety.js.map +0 -1
  87. package/lib/common/template-renderer.js +0 -115
  88. package/lib/common/template-renderer.js.map +0 -1
  89. package/lib/common/transaction.js +0 -84
  90. package/lib/common/transaction.js.map +0 -1
  91. package/lib/common/verifier.js +0 -151
  92. package/lib/common/verifier.js.map +0 -1
  93. package/templates/workspace/app/farris.config.mjs +0 -13
  94. package/templates/workspace/app/index.html +0 -12
  95. package/templates/workspace/app/package.json +0 -22
  96. package/templates/workspace/app/src/App.tsx +0 -11
  97. package/templates/workspace/app/src/locales/index.ts +0 -5
  98. package/templates/workspace/app/src/locales/zh-CN.json +0 -1
  99. package/templates/workspace/app/src/main.ts +0 -12
  100. package/templates/workspace/app/src/router/index.ts +0 -16
  101. package/templates/workspace/app/src/styles/index.css +0 -0
  102. package/templates/workspace/app/src/styles/index.scss +0 -0
  103. package/templates/workspace/app/src/views/home/composables/use-home.ts +0 -7
  104. package/templates/workspace/app/src/views/home/home.component.tsx +0 -15
  105. package/templates/workspace/app/src/views/home/index.ts +0 -4
  106. package/templates/workspace/app/tsconfig.json +0 -21
  107. package/templates/workspace/root/README.md +0 -28
  108. package/templates/workspace/root/package.json +0 -13
  109. package/templates/workspace/root/pnpm-workspace.yaml +0 -12
@@ -1,198 +0,0 @@
1
- import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
2
- import { resolve, join } from 'node:path';
3
- import { findAppContext, normalizeGeneratorName, toPascalCase, toCamelCase, toReadableTitle } from './common.js';
4
- import { Transaction } from '../../common/transaction.js';
5
- import { sendJson, logInfo, logWarn, fail, setJsonMode, createSpinner } from '../../common/output.js';
6
- import { ExitCode } from '../../common/constant.js';
7
- export async function generateView(rawName, options = {}) {
8
- const isJson = !!options.json;
9
- setJsonMode(isJson);
10
- if (!rawName) {
11
- fail({
12
- command: 'generate.view',
13
- error: '必须指定 View 页面名称: farris-cli generate view <name>',
14
- exitCode: ExitCode.GENERAL_ERROR
15
- });
16
- }
17
- const normalizedName = normalizeGeneratorName(rawName);
18
- if (!normalizedName.valid) {
19
- fail({
20
- command: 'generate.view',
21
- error: `非法的 View 名称: ${normalizedName.error}`,
22
- exitCode: ExitCode.GENERAL_ERROR
23
- });
24
- }
25
- const name = normalizedName.name;
26
- const pascalName = toPascalCase(name);
27
- const camelName = toCamelCase(name);
28
- const title = options.title || toReadableTitle(name);
29
- const withRoute = !!options.withRoute;
30
- const withProps = !!options.withProps;
31
- const appContext = findAppContext(options.cwd || process.cwd());
32
- const viewDir = join(appContext.srcDir, 'views', name);
33
- const composablesDir = join(viewDir, 'composables');
34
- const filesPlanned = [
35
- join(viewDir, 'index.ts'),
36
- join(viewDir, `${name}.component.tsx`),
37
- join(composablesDir, `use-${name}.ts`)
38
- ];
39
- if (withProps) {
40
- filesPlanned.push(join(viewDir, `${name}.props.ts`));
41
- }
42
- // 冲突检查
43
- const conflicts = filesPlanned.filter((f) => existsSync(f));
44
- if (conflicts.length > 0) {
45
- fail({
46
- command: 'generate.view',
47
- error: `页面文件已存在,为保护已有代码已阻断生成: ${conflicts.map((c) => resolve(c)).join(', ')}`,
48
- exitCode: ExitCode.TARGET_CONFLICT,
49
- extra: { conflicts }
50
- });
51
- }
52
- const transaction = new Transaction();
53
- const spinner = createSpinner(`正在生成 View: ${name}...`);
54
- spinner.start();
55
- try {
56
- mkdirSync(composablesDir, { recursive: true });
57
- transaction.recordCreatedDir(viewDir);
58
- transaction.recordCreatedDir(composablesDir);
59
- const filesCreated = [];
60
- const filesModified = [];
61
- // 1. 生成 composable: src/views/<name>/composables/use-<name>.ts
62
- const composablePath = join(composablesDir, `use-${name}.ts`);
63
- transaction.prepareWrite(composablePath);
64
- const composableContent = `export function use${pascalName}() {
65
- const title = ${JSON.stringify(title)};
66
-
67
- return {
68
- title
69
- };
70
- }
71
- `;
72
- writeFileSync(composablePath, composableContent, 'utf-8');
73
- filesCreated.push(composablePath);
74
- // 2. 生成 props (若启用): src/views/<name>/<name>.props.ts
75
- if (withProps) {
76
- const propsPath = join(viewDir, `${name}.props.ts`);
77
- transaction.prepareWrite(propsPath);
78
- const propsContent = `import type { ExtractPropTypes } from 'vue';
79
-
80
- export const ${camelName}ViewProps = {
81
- // 定义页面 Props
82
- };
83
-
84
- export type ${pascalName}ViewProps = ExtractPropTypes<typeof ${camelName}ViewProps>;
85
- `;
86
- writeFileSync(propsPath, propsContent, 'utf-8');
87
- filesCreated.push(propsPath);
88
- }
89
- // 3. 生成 component: src/views/<name>/<name>.component.tsx
90
- const componentPath = join(viewDir, `${name}.component.tsx`);
91
- transaction.prepareWrite(componentPath);
92
- const componentContent = `import { defineComponent } from 'vue';
93
- import { use${pascalName} } from './composables/use-${name}';
94
-
95
- export default defineComponent({
96
- name: '${pascalName}View',
97
- setup() {
98
- const { title } = use${pascalName}();
99
-
100
- return () => (
101
- <div class="f-page-${name}">
102
- <h2>{title}</h2>
103
- </div>
104
- );
105
- }
106
- });
107
- `;
108
- writeFileSync(componentPath, componentContent, 'utf-8');
109
- filesCreated.push(componentPath);
110
- // 4. 生成 index: src/views/<name>/index.ts
111
- const indexPath = join(viewDir, 'index.ts');
112
- transaction.prepareWrite(indexPath);
113
- let indexContent = `import ${pascalName}View from './${name}.component';\n\n`;
114
- if (withProps) {
115
- indexContent += `export { ${camelName}ViewProps, type ${pascalName}ViewProps } from './${name}.props';\n`;
116
- }
117
- indexContent += `export { ${pascalName}View };\nexport default ${pascalName}View;\n`;
118
- writeFileSync(indexPath, indexContent, 'utf-8');
119
- filesCreated.push(indexPath);
120
- // 5. 若指定 --with-route,尝试在路由中幂等注册
121
- let routeRegistered = false;
122
- let routeNotice = '';
123
- if (withRoute) {
124
- const routerIndexPath = join(appContext.srcDir, 'router', 'index.ts');
125
- const routesFilePath = join(appContext.srcDir, 'router', 'routes.ts');
126
- const targetRouterFile = existsSync(routerIndexPath)
127
- ? routerIndexPath
128
- : existsSync(routesFilePath)
129
- ? routesFilePath
130
- : null;
131
- if (targetRouterFile) {
132
- transaction.prepareWrite(targetRouterFile);
133
- let routerContent = readFileSync(targetRouterFile, 'utf-8');
134
- // 检查是否已存在对应路由 name 或 path
135
- const routeRegex = new RegExp(`name:\\s*['"]${pascalName}['"]|path:\\s*['"]/${name}['"]`);
136
- if (!routeRegex.test(routerContent)) {
137
- // 查找 routes 数组位置并插入
138
- const routesArrayMatch = routerContent.match(/(routes\s*(?::\s*RouteRecordRaw\[\])?\s*=\s*\[)([\s\S]*?)(\];)/);
139
- if (routesArrayMatch) {
140
- const existingEntries = routesArrayMatch[2].trimEnd();
141
- const needsComma = existingEntries.trim().length > 0 && !existingEntries.endsWith(',');
142
- const separator = needsComma ? ',' : '';
143
- const newRouteEntry = `\n {\n path: '/${name}',\n name: '${pascalName}',\n component: () => import('../views/${name}')\n },`;
144
- routerContent = routerContent.replace(routesArrayMatch[0], `${routesArrayMatch[1]}${existingEntries}${separator}${newRouteEntry}\n${routesArrayMatch[3]}`);
145
- writeFileSync(targetRouterFile, routerContent, 'utf-8');
146
- filesModified.push(targetRouterFile);
147
- routeRegistered = true;
148
- }
149
- else {
150
- routeNotice = `未在 ${targetRouterFile} 中识别出标准 routes 数组结构,请手动注册路由`;
151
- }
152
- }
153
- else {
154
- routeRegistered = true; // 已经存在,幂等跳过
155
- }
156
- }
157
- else {
158
- routeNotice = '未找到标准 src/router 路由文件,请手动注册路由配置';
159
- }
160
- }
161
- transaction.commit();
162
- spinner.succeed(`View ${name} 生成成功!`);
163
- if (isJson) {
164
- sendJson({
165
- command: 'generate.view',
166
- ok: true,
167
- viewName: name,
168
- pascalName,
169
- title,
170
- viewDir,
171
- withRoute,
172
- routeRegistered,
173
- routeNotice: routeNotice || undefined,
174
- filesCreated,
175
- filesModified
176
- });
177
- return;
178
- }
179
- logInfo(`\n✨ 已成功生成页面: src/views/${name}/`);
180
- filesCreated.forEach((f) => logInfo(` + ${f}`));
181
- if (filesModified.length > 0) {
182
- filesModified.forEach((f) => logInfo(` ~ ${f} (已自动注册路由)`));
183
- }
184
- if (routeNotice) {
185
- logWarn(` ! 路由提示: ${routeNotice}`);
186
- }
187
- }
188
- catch (err) {
189
- spinner.fail('生成 View 失败,正在回滚...');
190
- transaction.rollback();
191
- fail({
192
- command: 'generate.view',
193
- error: `生成 View 失败: ${err.message}`,
194
- exitCode: ExitCode.GENERAL_ERROR
195
- });
196
- }
197
- }
198
- //# sourceMappingURL=view.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"view.js","sourceRoot":"","sources":["../../../src/commands/generate/view.ts"],"names":[],"mappings":"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"}
@@ -1,181 +0,0 @@
1
- import { resolve, join, dirname } from 'node:path';
2
- import { existsSync, mkdirSync } from 'node:fs';
3
- import { ExitCode, getDirname } from '../../common/constant.js';
4
- import { renderTemplateDir } from '../../common/template-renderer.js';
5
- import { Transaction } from '../../common/transaction.js';
6
- import { verifyWorkspace } from '../../common/verifier.js';
7
- import { sendJson, logInfo, fail, setJsonMode, createSpinner } from '../../common/output.js';
8
- import { deriveAppDir, validatePackageName } from './create.js';
9
- /**
10
- * 向上查找 Workspace 根目录
11
- */
12
- export function findWorkspaceRoot(startDir = process.cwd()) {
13
- let current = resolve(startDir);
14
- while (true) {
15
- if (existsSync(join(current, 'pnpm-workspace.yaml')) && existsSync(join(current, 'package.json'))) {
16
- return current;
17
- }
18
- const parent = dirname(current);
19
- if (parent === current) {
20
- break;
21
- }
22
- current = parent;
23
- }
24
- return null;
25
- }
26
- export async function addAppToWorkspace(name, options = {}) {
27
- const isJson = !!options.json;
28
- setJsonMode(isJson);
29
- if (!name) {
30
- fail({
31
- command: 'workspace.add-app',
32
- error: '必须指定应用名称: farris-cli workspace add-app <name>',
33
- exitCode: ExitCode.GENERAL_ERROR
34
- });
35
- }
36
- if (!validatePackageName(name)) {
37
- fail({
38
- command: 'workspace.add-app',
39
- error: `非法的应用包名: "${name}"`,
40
- exitCode: ExitCode.GENERAL_ERROR
41
- });
42
- }
43
- const wsRoot = findWorkspaceRoot(options.cwd || process.cwd());
44
- if (!wsRoot) {
45
- fail({
46
- command: 'workspace.add-app',
47
- error: '当前目录或上级目录未找到标准 pnpm workspace (缺少 pnpm-workspace.yaml)',
48
- exitCode: ExitCode.GENERAL_ERROR
49
- });
50
- }
51
- const appDir = deriveAppDir(name);
52
- if (!appDir || !/^[a-z0-9-_]+$/.test(appDir)) {
53
- fail({
54
- command: 'workspace.add-app',
55
- error: `无法从应用名 "${name}" 推导出合法的子目录名`,
56
- exitCode: ExitCode.GENERAL_ERROR
57
- });
58
- }
59
- const title = options.title || name;
60
- const router = options.router ?? false;
61
- const routerMode = options.routerMode || 'hash';
62
- const format = options.format || 'es';
63
- const style = options.style || 'css';
64
- const appTargetDir = join(wsRoot, 'packages', appDir);
65
- if (existsSync(appTargetDir)) {
66
- fail({
67
- command: 'workspace.add-app',
68
- error: `子应用目录已存在: packages/${appDir}`,
69
- exitCode: ExitCode.TARGET_CONFLICT
70
- });
71
- }
72
- const templatesBase = resolve(getDirname(import.meta.url), '../../../templates/workspace');
73
- const appTemplateDir = join(templatesBase, 'app');
74
- const transaction = new Transaction();
75
- const spinner = createSpinner(`正在向 Workspace 添加子应用 ${name}...`);
76
- spinner.start();
77
- try {
78
- mkdirSync(appTargetDir, { recursive: true });
79
- transaction.recordCreatedDir(appTargetDir);
80
- const routerDependency = router ? ',\n "vue-router": "catalog:"' : '';
81
- const sassDevDependency = style === 'scss' ? ',\n "sass": "catalog:"' : '';
82
- let styleImport = '';
83
- if (style === 'css') {
84
- styleImport = "\nimport './styles/index.css';";
85
- }
86
- else if (style === 'scss') {
87
- styleImport = "\nimport './styles/index.scss';";
88
- }
89
- const routerImport = router ? "\nimport router from './router';" : '';
90
- const routerUse = router ? '\napp.use(router);' : '';
91
- const i18nImport = '';
92
- const i18nUse = '';
93
- const appRouterImport = router ? "\nimport { RouterView } from 'vue-router';" : '';
94
- const appTemplateBody = router
95
- ? ' <RouterView />'
96
- : ` <h1>${title}</h1>`;
97
- const appVariables = {
98
- appName: name,
99
- title,
100
- appDir,
101
- base: '/',
102
- routerMode: router ? routerMode : 'none',
103
- format,
104
- routerDependency,
105
- sassDevDependency,
106
- styleImport,
107
- routerImport,
108
- routerUse,
109
- i18nImport,
110
- i18nUse,
111
- appRouterImport,
112
- appTemplateBody,
113
- routerHistoryFunction: routerMode === 'history' ? 'createWebHistory' : 'createWebHashHistory',
114
- routerHistoryCall: routerMode === 'history'
115
- ? 'createWebHistory(import.meta.env.BASE_URL)'
116
- : 'createWebHashHistory()'
117
- };
118
- const appFilter = (relPath) => {
119
- const normalized = relPath.replace(/\\/g, '/');
120
- if (style === 'none' && normalized.startsWith('src/styles')) {
121
- return false;
122
- }
123
- if (style === 'css' && (normalized === 'src/styles/index.scss' || normalized === 'src/styles/index.scss.tpl')) {
124
- return false;
125
- }
126
- if (style === 'scss' && (normalized === 'src/styles/index.css' || normalized === 'src/styles/index.css.tpl')) {
127
- return false;
128
- }
129
- if (!router && (normalized.startsWith('src/router') || normalized.startsWith('src/views'))) {
130
- return false;
131
- }
132
- return true;
133
- };
134
- const appRender = renderTemplateDir({
135
- sourceDir: appTemplateDir,
136
- targetDir: appTargetDir,
137
- variables: appVariables,
138
- skipExisting: false,
139
- filter: appFilter
140
- });
141
- if (appRender.unreplacedPlaceholders.length > 0) {
142
- throw new Error(`子应用渲染出现未替换占位符: ${appRender.unreplacedPlaceholders.map((p) => `${p.file} (${p.placeholder})`).join(', ')}`);
143
- }
144
- appRender.filesCreated.forEach((f) => transaction.prepareWrite(f));
145
- // 执行 verify
146
- const verifyResult = verifyWorkspace(wsRoot);
147
- if (!verifyResult.ok) {
148
- throw new Error(`Workspace 校验失败: ${verifyResult.errors.join('; ')}`);
149
- }
150
- transaction.commit();
151
- spinner.succeed(`子应用 ${name} 添加成功!`);
152
- if (isJson) {
153
- sendJson({
154
- command: 'workspace.add-app',
155
- ok: true,
156
- workspaceRoot: wsRoot,
157
- appName: name,
158
- appDir,
159
- title,
160
- router,
161
- format,
162
- style,
163
- filesCreated: appRender.filesCreated
164
- });
165
- return;
166
- }
167
- logInfo(`\n✨ 已在 packages/${appDir} 成功创建应用 ${name}`);
168
- logInfo('\n启动该应用:');
169
- logInfo(` pnpm --filter "${name}" dev\n`);
170
- }
171
- catch (err) {
172
- spinner.fail('添加子应用失败,正在回滚...');
173
- transaction.rollback();
174
- fail({
175
- command: 'workspace.add-app',
176
- error: `添加应用失败: ${err.message}`,
177
- exitCode: ExitCode.GENERAL_ERROR
178
- });
179
- }
180
- }
181
- //# sourceMappingURL=add-app.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"add-app.js","sourceRoot":"","sources":["../../../src/commands/workspace/add-app.ts"],"names":[],"mappings":"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"}