kintone-migrator 0.15.0 → 0.16.0

package/dist/index.mjs

@@ -1756,22 +1756,23 @@ function resolveSingleApp(config, appName) {
 
 //#endregion
 //#region src/core/domain/projectConfig/appFilePaths.ts
-function buildAppFilePaths(appName) {
+function buildAppFilePaths(appName, baseDir) {
+	const prefix = (path) => baseDir ? join(baseDir, path) : path;
 	return {
-		schema: `schemas/${appName}.yaml`,
-		seed: `seeds/${appName}.yaml`,
-		customize: `customize/${appName}.yaml`,
-		view: `view/${appName}.yaml`,
-		settings: `settings/${appName}.yaml`,
-		notification: `notification/${appName}.yaml`,
-		report: `report/${appName}.yaml`,
-		action: `action/${appName}.yaml`,
-		process: `process/${appName}.yaml`,
-		fieldAcl: `field-acl/${appName}.yaml`,
-		appAcl: `app-acl/${appName}.yaml`,
-		recordAcl: `record-acl/${appName}.yaml`,
-		adminNotes: `admin-notes/${appName}.yaml`,
-		plugin: `plugin/${appName}.yaml`
+		schema: prefix(`schemas/${appName}.yaml`),
+		seed: prefix(`seeds/${appName}.yaml`),
+		customize: prefix(`customize/${appName}.yaml`),
+		view: prefix(`view/${appName}.yaml`),
+		settings: prefix(`settings/${appName}.yaml`),
+		notification: prefix(`notification/${appName}.yaml`),
+		report: prefix(`report/${appName}.yaml`),
+		action: prefix(`action/${appName}.yaml`),
+		process: prefix(`process/${appName}.yaml`),
+		fieldAcl: prefix(`field-acl/${appName}.yaml`),
+		appAcl: prefix(`app-acl/${appName}.yaml`),
+		recordAcl: prefix(`record-acl/${appName}.yaml`),
+		adminNotes: prefix(`admin-notes/${appName}.yaml`),
+		plugin: prefix(`plugin/${appName}.yaml`)
 	};
 }
 
@@ -3388,7 +3389,7 @@ function planResources(resources, platformDir, resourceType, relativeBaseDir) {
 	};
 }
 function planPlatform(remotePlatform, platformName, args) {
-	const platformDir = join(args.input.basePath, platformName);
+	const platformDir = join(args.input.basePath, args.input.filePrefix, platformName);
 	const platformPrefix = join(args.input.filePrefix, platformName);
 	const jsPlan = planResources(remotePlatform.js, platformDir, "js", platformPrefix);
 	const cssPlan = planResources(remotePlatform.css, platformDir, "css", platformPrefix);
@@ -3445,10 +3446,8 @@ async function saveCustomization({ container, input }) {
 //#region src/cli/commands/customize/capture.ts
 function deriveFilePrefix(customizeFilePath) {
 	const resolved = resolve(customizeFilePath);
-	const parentDir = basename(dirname(resolved));
 	const fileName = basename(resolved, extname(resolved));
-	if (parentDir === "") return fileName;
-	if (fileName === "customize") return parentDir;
+	if (fileName === "customize") return "";
 	return fileName;
 }
 async function runCaptureCustomization(config) {
@@ -5173,7 +5172,7 @@ function createCliCaptureContainers(input) {
 		appId: input.appId,
 		guestSpaceId: input.guestSpaceId
 	};
-	const paths = buildAppFilePaths(input.appName);
+	const paths = buildAppFilePaths(input.appName, input.baseDir);
 	return {
 		paths,
 		containers: {
@@ -6234,7 +6233,7 @@ function generateProjectConfig(input) {
 		const name = deduplicateAppName(resolveAppName(app), usedNames);
 		apps[name] = {
 			appId: app.appId,
-			files: buildAppFilePaths(name)
+			files: buildAppFilePaths(name, input.baseDir)
 		};
 	}
 	const config = {
@@ -6262,7 +6261,7 @@ const initArgs = {
 	output: {
 		type: "string",
 		short: "o",
-		description: "Output config file path (default: kintone-migrator.yaml)"
+		description: "Output directory"
 	},
 	yes: {
 		type: "boolean",
@@ -6299,7 +6298,8 @@ var init_default = define({
 			const baseUrl = validateKintoneDomain(kintoneDomain);
 			const auth = resolveAuth(apiToken, username, password);
 			const guestSpaceId = values["guest-space-id"] ?? process.env.KINTONE_GUEST_SPACE_ID;
-			const configPath = values.output ?? DEFAULT_CONFIG_PATH;
+			const output = values.output;
+			const configPath = output ? join(output, DEFAULT_CONFIG_PATH) : DEFAULT_CONFIG_PATH;
 			const skipConfirm = values.yes ?? false;
 			const dryRun = values["dry-run"] ?? false;
 			const { spaceReader, projectConfigStorage } = createInitCliContainer({
@@ -6323,7 +6323,8 @@ var init_default = define({
 			const configText = generateProjectConfig({
 				apps,
 				domain: kintoneDomain,
-				guestSpaceId
+				guestSpaceId,
+				baseDir: output
 			});
 			if (dryRun) {
 				p.log.info(pc.dim("(dry-run mode - no files will be written)"));
@@ -6331,7 +6332,7 @@ var init_default = define({
 				p.log.message(configText);
 				for (const app of apps) {
 					const appName = resolveAppName(app);
-					const paths = buildAppFilePaths(appName);
+					const paths = buildAppFilePaths(appName, output);
 					p.log.step(`\n=== [${pc.bold(appName)}] (appId: ${app.appId}) ===`);
 					p.log.message("  Files that would be created:");
 					for (const [domain, filePath] of Object.entries(paths)) p.log.message(`    ${domain}: ${pc.dim(filePath)}`);
@@ -6356,7 +6357,8 @@ var init_default = define({
 					auth,
 					appId: app.appId,
 					guestSpaceId,
-					appName
+					appName,
+					baseDir: output
 				});
 				const cs = p.spinner();
 				cs.start(`Capturing all domains for ${appName}...`);