kintone-migrator 0.12.0 → 0.12.1

package/dist/index.mjs

@@ -1571,6 +1571,7 @@ function parseAuth(raw) {
 		password
 	};
 }
+const ConfigParser$1 = { parse: parseProjectConfig };
 
 //#endregion
 //#region src/core/application/projectConfig/loadProjectConfig.ts
@@ -1581,7 +1582,7 @@ function loadProjectConfig(input) {
 	} catch (cause) {
 		throw new ValidationError(ValidationErrorCode.InvalidInput, "Invalid YAML syntax in config file", cause);
 	}
-	return parseProjectConfig(raw);
+	return ConfigParser$1.parse(raw);
 }
 
 //#endregion
@@ -1631,13 +1632,14 @@ function resolveExecutionOrder(apps) {
 function validateDependencyReferences(apps) {
 	for (const [name, entry] of apps) for (const dep of entry.dependsOn) if (!apps.has(dep)) throw new BusinessRuleError(ProjectConfigErrorCode.UnknownDependency, `App "${name}" depends on unknown app "${dep}"`);
 }
+const DependencyResolver = { resolve: resolveExecutionOrder };
 
 //#endregion
 //#region src/core/application/projectConfig/resolveExecutionPlan.ts
 function resolveExecutionPlan(input) {
 	const { config, appName, all } = input;
 	if (appName) return resolveSingleApp(config, appName);
-	if (all) return resolveExecutionOrder(config.apps);
+	if (all) return DependencyResolver.resolve(config.apps);
 	throw new ValidationError(ValidationErrorCode.InvalidInput, "At least one mode (appName or all) must be selected");
 }
 function resolveSingleApp(config, appName) {
@@ -1938,6 +1940,7 @@ var capture_field_acl_default = define({
 
 //#endregion
 //#region src/core/domain/customization/services/resourceMerger.ts
+const MAX_RESOURCES_PER_CATEGORY = 30;
 function remoteToResolved(resource) {
 	if (resource.type === "URL") return resource;
 	return {
@@ -1946,17 +1949,22 @@ function remoteToResolved(resource) {
 		name: resource.file.name
 	};
 }
-const ResourceMerger = { mergeResources: (current, incoming) => {
-	const incomingFileNames = /* @__PURE__ */ new Set();
-	const incomingUrls = /* @__PURE__ */ new Set();
-	for (const resource of incoming) if (resource.type === "FILE") incomingFileNames.add(resource.name);
-	else incomingUrls.add(resource.url);
-	const kept = [];
-	for (const resource of current) if (resource.type === "FILE") {
-		if (!incomingFileNames.has(resource.file.name)) kept.push(remoteToResolved(resource));
-	} else if (!incomingUrls.has(resource.url)) kept.push(resource);
-	return [...kept, ...incoming];
-} };
+const ResourceMerger = {
+	assertResourceCount: (label, resources) => {
+		if (resources.length > MAX_RESOURCES_PER_CATEGORY) throw new BusinessRuleError(CustomizationErrorCode.CzTooManyFiles, `${label} has ${resources.length} resources, exceeding the maximum of ${MAX_RESOURCES_PER_CATEGORY}`);
+	},
+	mergeResources: (current, incoming) => {
+		const incomingFileNames = /* @__PURE__ */ new Set();
+		const incomingUrls = /* @__PURE__ */ new Set();
+		for (const resource of incoming) if (resource.type === "FILE") incomingFileNames.add(resource.name);
+		else incomingUrls.add(resource.url);
+		const kept = [];
+		for (const resource of current) if (resource.type === "FILE") {
+			if (!incomingFileNames.has(resource.file.name)) kept.push(remoteToResolved(resource));
+		} else if (!incomingUrls.has(resource.url)) kept.push(resource);
+		return [...kept, ...incoming];
+	}
+};
 
 //#endregion
 //#region src/core/domain/customization/services/configParser.ts
@@ -2037,7 +2045,6 @@ function parseConfigText(rawText) {
 
 //#endregion
 //#region src/core/application/customization/applyCustomization.ts
-const MAX_RESOURCES_PER_CATEGORY = 30;
 async function resolveResources(platform, basePath, fileUploader) {
 	const resolveList = async (resources) => {
 		return Promise.all(resources.map(async (resource) => {
@@ -2063,9 +2070,6 @@ function mergePlatform(current, incoming) {
 		css: ResourceMerger.mergeResources(current.css, incoming.css)
 	};
 }
-function validateResourceCount(label, resources) {
-	if (resources.length > MAX_RESOURCES_PER_CATEGORY) throw new BusinessRuleError(CustomizationErrorCode.CzTooManyFiles, `${label} has ${resources.length} resources, exceeding the maximum of ${MAX_RESOURCES_PER_CATEGORY}`);
-}
 async function applyCustomization({ container, input }) {
 	const result = await container.customizationStorage.get();
 	if (!result.exists) throw new ValidationError(ValidationErrorCode.InvalidInput, "Customization config file not found");
@@ -2074,10 +2078,10 @@ async function applyCustomization({ container, input }) {
 	const [resolvedDesktop, resolvedMobile] = await Promise.all([resolveResources(config.desktop, input.basePath, container.fileUploader), resolveResources(config.mobile, input.basePath, container.fileUploader)]);
 	const mergedDesktop = mergePlatform(currentCustomization.desktop, resolvedDesktop);
 	const mergedMobile = mergePlatform(currentCustomization.mobile, resolvedMobile);
-	validateResourceCount("desktop.js", mergedDesktop.js);
-	validateResourceCount("desktop.css", mergedDesktop.css);
-	validateResourceCount("mobile.js", mergedMobile.js);
-	validateResourceCount("mobile.css", mergedMobile.css);
+	ResourceMerger.assertResourceCount("desktop.js", mergedDesktop.js);
+	ResourceMerger.assertResourceCount("desktop.css", mergedDesktop.css);
+	ResourceMerger.assertResourceCount("mobile.js", mergedMobile.js);
+	ResourceMerger.assertResourceCount("mobile.css", mergedMobile.css);
 	await container.customizationConfigurator.updateCustomization({
 		scope: config.scope,
 		desktop: {
@@ -3118,14 +3122,35 @@ async function executeMigration({ container }) {
 	const added = diff.entries.filter((e) => e.type === "added");
 	const modified = diff.entries.filter((e) => e.type === "modified");
 	const deleted = diff.entries.filter((e) => e.type === "deleted");
-	if (added.length > 0) {
-		const fields = added.filter((e) => e.after !== void 0).filter((e) => !subtableInnerCodes.has(e.fieldCode)).map((e) => e.after);
-		if (fields.length > 0) await container.formConfigurator.addFields(fields);
-	}
-	if (modified.length > 0) {
-		const fields = modified.filter((e) => e.after !== void 0).filter((e) => !subtableInnerCodes.has(e.fieldCode)).map((e) => e.after);
-		if (fields.length > 0) await container.formConfigurator.updateFields(fields);
+	const fieldsToAdd = [];
+	const fieldsToUpdate = [];
+	for (const entry of added) {
+		if (entry.after === void 0) continue;
+		if (subtableInnerCodes.has(entry.fieldCode)) continue;
+		fieldsToAdd.push(entry.after);
+	}
+	for (const entry of modified) {
+		if (entry.after === void 0) continue;
+		if (subtableInnerCodes.has(entry.fieldCode)) continue;
+		const after = entry.after;
+		const before = entry.before;
+		if (after.type === "SUBTABLE" && before !== void 0 && before.type === "SUBTABLE") {
+			const newInnerFields = /* @__PURE__ */ new Map();
+			const existingInnerFields = /* @__PURE__ */ new Map();
+			for (const [code, def] of after.properties.fields) if (before.properties.fields.has(code)) existingInnerFields.set(code, def);
+			else newInnerFields.set(code, def);
+			if (newInnerFields.size > 0) fieldsToAdd.push({
+				...after,
+				properties: { fields: newInnerFields }
+			});
+			if (existingInnerFields.size > 0) fieldsToUpdate.push({
+				...after,
+				properties: { fields: existingInnerFields }
+			});
+		} else fieldsToUpdate.push(after);
 	}
+	if (fieldsToAdd.length > 0) await container.formConfigurator.addFields(fieldsToAdd);
+	if (fieldsToUpdate.length > 0) await container.formConfigurator.updateFields(fieldsToUpdate);
 	if (deleted.length > 0) {
 		const currentSubtableInnerCodes = collectSubtableInnerFieldCodes(currentFields);
 		const fieldCodes = deleted.filter((e) => !currentSubtableInnerCodes.has(e.fieldCode)).map((e) => e.fieldCode);
@@ -3245,7 +3270,23 @@ async function forceOverrideForm({ container }) {
 	const toDelete = [];
 	for (const [fieldCode, schemaDef] of schema.fields) {
 		if (subtableInnerCodes.has(fieldCode)) continue;
-		if (currentFields.has(fieldCode)) toUpdate.push(schemaDef);
+		if (currentFields.has(fieldCode)) if (schemaDef.type === "SUBTABLE") {
+			const currentDef = currentFields.get(fieldCode);
+			if (currentDef !== void 0 && currentDef.type === "SUBTABLE") {
+				const newInnerFields = /* @__PURE__ */ new Map();
+				const existingInnerFields = /* @__PURE__ */ new Map();
+				for (const [code, def] of schemaDef.properties.fields) if (currentDef.properties.fields.has(code)) existingInnerFields.set(code, def);
+				else newInnerFields.set(code, def);
+				if (newInnerFields.size > 0) toAdd.push({
+					...schemaDef,
+					properties: { fields: newInnerFields }
+				});
+				if (existingInnerFields.size > 0) toUpdate.push({
+					...schemaDef,
+					properties: { fields: existingInnerFields }
+				});
+			} else toUpdate.push(schemaDef);
+		} else toUpdate.push(schemaDef);
 		else toAdd.push(schemaDef);
 	}
 	const currentSubtableInnerCodes = collectSubtableInnerFieldCodes(currentFields);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kintone-migrator",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "kintone form schema migration tool",
   "license": "MIT",
   "author": "Hikaru Otabe",