@lazycatcloud/lzc-cli 2.0.0-pre.2 → 2.0.0-pre.4

package/changelog.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [2.0.0-pre.4](https://gitee.com/linakesi/lzc-cli/compare/v2.0.0-pre.3...v2.0.0-pre.4) (2026-03-14)
+
+### Features
+
+- support build package metadata overrides
+
+## [2.0.0-pre.3](https://gitee.com/linakesi/lzc-cli/compare/v2.0.0-pre.2...v2.0.0-pre.3) (2026-03-12)
+
+### Features
+
+- refresh the backend template assets and set `mini_os_version` to `v1.5.0`
+
+### Bug Fixes
+
+- use top-level override semantics for dev build config
+
 ## [2.0.0-pre.2](https://gitee.com/linakesi/lzc-cli/compare/v2.0.0-pre.1...v2.0.0-pre.2) (2026-03-12)
 
 ### Bug Fixes

package/lib/app/lpk_build.js

@@ -11,7 +11,6 @@ import yaml from 'js-yaml';
 import { buildConfiguredImagesToTempDir } from './lpk_build_images.js';
 import { pipeline } from 'node:stream/promises';
 import { t } from '../i18n/index.js';
-import mergeWith from 'lodash.mergewith';
 
 async function archiveFolderTo(appDir, out, format = 'zip') {
 	return new Promise(async (resolve, reject) => {
@@ -298,24 +297,45 @@ function formatBytes(bytes) {
 }
 
 function mergeBuildOptions(baseOptions, topOptions) {
-	return mergeWith({}, baseOptions ?? {}, topOptions ?? {}, (objValue, srcValue) => {
-		if (Array.isArray(srcValue)) {
-			return srcValue;
-		}
-		return undefined;
-	});
+	return {
+		...(baseOptions ?? {}),
+		...(topOptions ?? {}),
+	};
 }
 
-function applyPkgIdSuffix(packageId, suffix) {
-	const normalizedPackageId = String(packageId ?? '').trim();
-	const normalizedSuffix = String(suffix ?? '').trim();
-	if (!normalizedSuffix) {
-		return normalizedPackageId;
+function normalizePackageMetadataOverride(options, fieldName) {
+	if (!Object.prototype.hasOwnProperty.call(options ?? {}, fieldName)) {
+		return '';
 	}
-	if (!normalizedPackageId) {
-		throw new Error('package is empty, cannot apply pkg_id_suffix');
+	const normalizedValue = String(options[fieldName] ?? '').trim();
+	if (!normalizedValue) {
+		throw new Error(`${fieldName} cannot be empty when specified`);
 	}
-	return `${normalizedPackageId}.${normalizedSuffix}`;
+	return normalizedValue;
+}
+
+function applyPackageMetadataOverrides(manifest, packageInfo, options) {
+	const pkgId = normalizePackageMetadataOverride(options, 'pkg_id');
+	const pkgName = normalizePackageMetadataOverride(options, 'pkg_name');
+	const hasPackageMetadataOverrides = !!pkgId || !!pkgName;
+	let nextManifest = { ...(manifest ?? {}) };
+	let nextPackageInfo = packageInfo;
+
+	if (pkgId) {
+		nextManifest = { ...nextManifest, package: pkgId };
+		nextPackageInfo = { ...(nextPackageInfo ?? {}), package: pkgId };
+	}
+
+	if (pkgName) {
+		nextManifest = { ...nextManifest, name: pkgName };
+		nextPackageInfo = { ...(nextPackageInfo ?? {}), name: pkgName };
+	}
+
+	return {
+		manifest: nextManifest,
+		packageInfo: nextPackageInfo,
+		hasPackageMetadataOverrides,
+	};
 }
 
 export function validatePackageFileForArchiveFormat(hasPackageFile, archiveFormat) {
@@ -331,8 +351,8 @@ function hasBuildEnvEntries(envEntries) {
 	return Array.isArray(envEntries) && envEntries.length > 0;
 }
 
-export function shouldUseV2PackageLayout({ forceV2 = false, hasPackageFile = false, hasImagesConfig = false, buildEnvEntries = [] } = {}) {
-	return !!forceV2 || !!hasPackageFile || !!hasImagesConfig || hasBuildEnvEntries(buildEnvEntries);
+export function shouldUseV2PackageLayout({ forceV2 = false, hasPackageFile = false, hasImagesConfig = false, buildEnvEntries = [], hasPackageMetadataOverrides = false } = {}) {
+	return !!forceV2 || !!hasPackageFile || !!hasImagesConfig || hasBuildEnvEntries(buildEnvEntries) || !!hasPackageMetadataOverrides;
 }
 
 function logDeprecatedStaticFieldWarning(manifestPath, fields) {
@@ -350,6 +370,16 @@ function normalizeBuildOptions(options) {
 	return normalized;
 }
 
+function normalizeContentDir(contentdir) {
+	if (contentdir === undefined || contentdir === null) {
+		return '';
+	}
+	if (typeof contentdir === 'string') {
+		return contentdir.trim();
+	}
+	return contentdir;
+}
+
 function loadYamlIfExists(filePath) {
 	if (!filePath || !isFileExist(filePath)) {
 		return {};
@@ -399,6 +429,7 @@ export class LpkBuild {
 		this.sourceManifest = null;
 		this.packageInfo = null;
 		this.hasPackageFile = false;
+		this.hasPackageMetadataOverrides = false;
 		this.buildVars = null;
 		this.preprocessedManifestText = '';
 
@@ -427,6 +458,7 @@ export class LpkBuild {
 		this.sourceManifest = null;
 		this.packageInfo = null;
 		this.hasPackageFile = false;
+		this.hasPackageMetadataOverrides = false;
 		this.buildVars = buildVarsFromEnvEntries(this.options['envs']);
 		this.preprocessedManifestText = '';
 		return this;
@@ -479,15 +511,10 @@ export class LpkBuild {
 		this.sourceManifest = loaded.sourceManifest;
 		this.packageInfo = loaded.packageInfo;
 		this.hasPackageFile = loaded.hasPackageFile;
-		this.manifest = loaded.manifest;
-
-		const packageWithSuffix = applyPkgIdSuffix(this.manifest['package'], this.options['pkg_id_suffix']);
-		if (packageWithSuffix !== this.manifest['package']) {
-			this.manifest = { ...this.manifest, package: packageWithSuffix };
-			if (this.hasPackageFile) {
-				this.packageInfo = { ...(this.packageInfo ?? {}), package: packageWithSuffix };
-			}
-		}
+		const packageMetadata = applyPackageMetadataOverrides(loaded.manifest, loaded.packageInfo, this.options);
+		this.manifest = packageMetadata.manifest;
+		this.packageInfo = packageMetadata.packageInfo;
+		this.hasPackageMetadataOverrides = packageMetadata.hasPackageMetadataOverrides;
 
 		if (!isValidPackageName(this.manifest['package'])) {
 			throw t('lzc_cli.lib.app.lpk_build.get_manifest_package_name_fail', `{{ package }} 含有非法字符，请使用正确的包名格式(java的包名格式)，如：cloud.lazycat.apps.video`, {
@@ -541,7 +568,7 @@ export class LpkBuild {
 		}
 
 		const tempDir = fs.mkdtempSync('.lzc-cli-build');
-		let contentdir = this.options['contentdir'];
+		let contentdir = normalizeContentDir(this.options['contentdir']);
 		let browserExtension = this.options['browser-extension'];
 		let aiPodService = this.options['ai-pod-service'];
 		try {
@@ -652,6 +679,7 @@ export class LpkBuild {
 				hasPackageFile: this.hasPackageFile,
 				hasImagesConfig,
 				buildEnvEntries: this.options['envs'],
+				hasPackageMetadataOverrides: this.hasPackageMetadataOverrides,
 			});
 			if (useV2PackageLayout) {
 				logDeprecatedStaticFieldWarning(this.manifestFilePath, findManifestStaticFields(this.sourceManifest));

package/lib/app/lpk_create.js

@@ -212,17 +212,18 @@ export class TemplateInit {
 		this.type = normalizeTemplateType(type);
 		this.lpkManifest = new LpkManifest(name);
 		this.lpkPackageFile = new LpkPackageFile(name);
+		this.templateVars = null;
 	}
 
 	async init() {
 		this.type = await chooseTemplate(this.type);
 
-		const templateRoot = path.join(contextDirname(import.meta.url), '..', '..', 'template', '_lpk');
-		const typeTemplatePath = path.join(templateRoot, `${this.type}.manifest.yml.in`);
-		const manifestTemplatePath = isFileExist(typeTemplatePath) ? typeTemplatePath : path.join(templateRoot, 'manifest.yml.in');
-		const packageTemplatePath = path.join(templateRoot, 'package.yml.in');
-		const templateVars = await this.lpkManifest.init(manifestTemplatePath, true);
-		await this.lpkPackageFile.init(packageTemplatePath, true, templateVars);
+			const templateRoot = path.join(contextDirname(import.meta.url), '..', '..', 'template', '_lpk');
+			const typeTemplatePath = path.join(templateRoot, `${this.type}.manifest.yml.in`);
+			const manifestTemplatePath = isFileExist(typeTemplatePath) ? typeTemplatePath : path.join(templateRoot, 'manifest.yml.in');
+			const packageTemplatePath = path.join(templateRoot, 'package.yml.in');
+			this.templateVars = await this.lpkManifest.init(manifestTemplatePath, true);
+			await this.lpkPackageFile.init(packageTemplatePath, true, this.templateVars);
 	}
 
 	async create() {
@@ -286,7 +287,7 @@ class LpkCreate {
 				),
 			);
 		}
-		await TemplateConfig[type].build(path.resolve(this.cwd, this.name));
+			await TemplateConfig[type].build(path.resolve(this.cwd, this.name), { templateVars: template.templateVars });
 
 		console.log(chalk.green(t('lzc_cli.lib.app.lpk_create.exec_init_project_success_tips', `✨ 初始化懒猫云应用`)));
 		await TemplateConfig[type].after(this.name, this.cwd);

package/lib/app/lpk_create_generator.js

@@ -8,8 +8,23 @@ import logger from 'loglevel';
 import { t } from '../i18n/index.js';
 
 const __dirname = contextDirname(import.meta.url);
+const PROJECT_CREATE_PACKAGE_DEV_PLACEHOLDER = '__PROJECT_CREATE_PACKAGE_DEV__';
 
-async function loadFiles(dirPath, prefix = '') {
+function renderProjectCreateFileContent(filePath, content, opts = {}) {
+	if (typeof content !== 'string' || path.basename(filePath) !== 'lzc-build.dev.yml') {
+		return content;
+	}
+	if (!content.includes(PROJECT_CREATE_PACKAGE_DEV_PLACEHOLDER)) {
+		return content;
+	}
+	const packageId = String(opts.templateVars?.package ?? '').trim();
+	if (!packageId) {
+		throw new Error(`templateVars.package is required for ${filePath}`);
+	}
+	return content.replaceAll(PROJECT_CREATE_PACKAGE_DEV_PLACEHOLDER, `${packageId}.dev`);
+}
+
+async function loadFiles(dirPath, prefix = '', opts = {}) {
 	const templateRoot = path.join(__dirname, '..', '..', 'template');
 	const templateDir = path.join(templateRoot, dirPath);
 
@@ -26,15 +41,16 @@ async function loadFiles(dirPath, prefix = '') {
 		} else {
 			content = fs.readFileSync(sourcePath, 'utf8');
 		}
-		if (p.startsWith('_')) {
-			p = p.replace('_', '.');
-		}
+			if (p.startsWith('_')) {
+				p = p.replace('_', '.');
+			}
 
-		files[path.join(prefix, p)] = {
-			content,
-			mode,
-		};
-	}
+			const outputPath = path.join(prefix, p);
+			files[outputPath] = {
+				content: renderProjectCreateFileContent(outputPath, content, opts),
+				mode,
+			};
+		}
 	return files;
 }
 
@@ -50,7 +66,7 @@ function writeFileTree(target, files) {
 }
 
 export async function generate(type, to, opts = {}) {
-	const files = await loadFiles(type, opts.prefix);
+	const files = await loadFiles(type, opts.prefix, opts);
 	writeFileTree(to, files);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@lazycatcloud/lzc-cli",
-	"version": "2.0.0-pre.2",
+	"version": "2.0.0-pre.4",
 	"description": "lazycat cloud developer kit",
 	"scripts": {
 		"release": "release-it patch",

package/template/_lpk/README.md

@@ -9,6 +9,7 @@ lzc-cli project info
 默认情况下，project 命令在存在 `lzc-build.dev.yml` 时会优先使用它。
 每个命令都会打印实际使用的 `Build config`。
 如果要操作 `lzc-build.yml`，请显式加上 `--release`。
+`lzc-build.dev.yml` 中出现的同名顶层字段会整体覆盖 `lzc-build.yml`，不会做递归 merge。
 如果是前端模板，`project deploy` 会按 `buildscript` 自动安装依赖并完成构建，不需要额外先执行 `npm install`。
 
 ## 构建

package/template/blank/lzc-build.dev.yml

@@ -1,4 +1,7 @@
 # 开发态覆盖配置
 
-# pkg_id_suffix: append an extra package id segment for dev deploys
-pkg_id_suffix: dev
+# 覆盖开发态包名，避免覆盖 release 安装包
+pkg_id: cloud.lazycat.app.helloworld.dev
+
+# 覆盖 release 配置中的 contentdir；留空表示开发态不打包内容目录
+contentdir:

package/template/golang/lzc-build.dev.yml

@@ -1,7 +1,10 @@
 # 开发态覆盖配置
 
-# pkg_id_suffix: append an extra package id segment for dev deploys
-pkg_id_suffix: dev
+# 覆盖开发态包名，避免覆盖 release 安装包
+pkg_id: __PROJECT_CREATE_PACKAGE_DEV__
+
+# 覆盖 release 配置中的 contentdir；留空表示开发态不打包内容目录
+contentdir:
 
 envs:
   - DEV_MODE=1

package/template/gui-vnc/lzc-build.dev.yml

@@ -1,4 +1,7 @@
 # 开发态覆盖配置
 
-# pkg_id_suffix: append an extra package id segment for dev deploys
-pkg_id_suffix: dev
+# 覆盖开发态包名，避免覆盖 release 安装包
+pkg_id: __PROJECT_CREATE_PACKAGE_DEV__
+
+# 覆盖 release 配置中的 contentdir；留空表示开发态不打包内容目录
+contentdir:

package/template/python/lzc-build.dev.yml

@@ -1,7 +1,10 @@
 # 开发态覆盖配置
 
-# pkg_id_suffix: append an extra package id segment for dev deploys
-pkg_id_suffix: dev
+# 覆盖开发态包名，避免覆盖 release 安装包
+pkg_id: __PROJECT_CREATE_PACKAGE_DEV__
+
+# 覆盖 release 配置中的 contentdir；留空表示开发态不打包内容目录
+contentdir:
 
 envs:
   - DEV_MODE=1

package/template/springboot/lzc-build.dev.yml

@@ -1,7 +1,10 @@
 # 开发态覆盖配置
 
-# pkg_id_suffix: append an extra package id segment for dev deploys
-pkg_id_suffix: dev
+# 覆盖开发态包名，避免覆盖 release 安装包
+pkg_id: __PROJECT_CREATE_PACKAGE_DEV__
+
+# 覆盖 release 配置中的 contentdir；留空表示开发态不打包内容目录
+contentdir:
 
 envs:
   - DEV_MODE=1

package/template/vue/lzc-build.dev.yml

@@ -1,7 +1,10 @@
 # 开发态覆盖配置
 
-# pkg_id_suffix: append an extra package id segment for dev deploys
-pkg_id_suffix: dev
+# 覆盖开发态包名，避免覆盖 release 安装包
+pkg_id: __PROJECT_CREATE_PACKAGE_DEV__
+
+# 覆盖 release 配置中的 contentdir；留空表示开发态不打包内容目录
+contentdir:
 
 envs:
   - DEV_MODE=1

package/template/vue-minidb/lzc-build.dev.yml

@@ -1,7 +1,10 @@
 # 开发态覆盖配置
 
-# pkg_id_suffix: append an extra package id segment for dev deploys
-pkg_id_suffix: dev
+# 覆盖开发态包名，避免覆盖 release 安装包
+pkg_id: __PROJECT_CREATE_PACKAGE_DEV__
+
+# 覆盖 release 配置中的 contentdir；留空表示开发态不打包内容目录
+contentdir:
 
 envs:
   - DEV_MODE=1