@abapify/adt-plugin-abapgit 0.4.33 → 0.4.36

package/dist/index.mjs

@@ -68,7 +68,7 @@ function formatXmlAttributes(xml) {
 		}
 		const tagContent = xml.slice(openBracket + 1, closeBracket);
 		const spaceIdx = tagContent.indexOf(" ");
-		if (spaceIdx === -1 || tagContent[0] === "/" || tagContent[0] === "!" || tagContent[0] === "?") {
+		if (spaceIdx === -1 || tagContent.startsWith("/") || tagContent.startsWith("!") || tagContent.startsWith("?")) {
 			result += xml.slice(openBracket, closeBracket + 1);
 			pos = closeBracket + 1;
 			continue;
@@ -257,7 +257,8 @@ function createHandler(adkClassOrType, definition) {
 		const suffixBySourceKey = new Map([["main", void 0], ...Object.entries(definition.suffixToSourceKey ?? {}).map(([suffix, sourceKey]) => [sourceKey, suffix])]);
 		const objectName = ctx.getObjectName(object);
 		const files = [];
-		for (const sourceKey of sourceKeys.sort((left, right) => left.localeCompare(right, "en-US"))) {
+		sourceKeys.sort((left, right) => left.localeCompare(right, "en-US"));
+		for (const sourceKey of sourceKeys) {
 			const file = createExplicitSourceFile(sourceKey, sources[sourceKey], suffixBySourceKey, objectName);
 			if (file) files.push(file);
 		}
@@ -19478,10 +19479,11 @@ const programHandler = createHandler("PROG", {
 			...data,
 			type: "PROG/I"
 		};
+		const baseProgramType = subc === "S" ? "subroutinePool" : "executableProgram";
 		return {
 			...data,
 			type: "PROG/P",
-			programType: subc === "M" ? "modulePool" : subc === "S" ? "subroutinePool" : "executableProgram"
+			programType: subc === "M" ? "modulePool" : baseProgramType
 		};
 	},
 	setSources: (obj, sources) => {
@@ -19567,7 +19569,7 @@ async function buildFunctionModuleFiles(obj, fmItems, suppliedSources, ctx) {
 		const suppliedFmSource = suppliedSources?.[sourceKey];
 		if (hasExplicitSources && suppliedFmSource === void 0) continue;
 		try {
-			const source = suppliedFmSource !== void 0 ? suppliedFmSource : await obj.client.adt.functions.groups.fmodules.source.main.get(obj.name, fm.name);
+			const source = suppliedFmSource ?? await obj.client.adt.functions.groups.fmodules.source.main.get(obj.name, fm.name);
 			if (shouldIncludeSource(source, suppliedFmSource)) files.push(ctx.createFile(`${objectName}.${ctx.fileExtension}.${funcName}.abap`, source));
 		} catch {}
 	}
@@ -19664,7 +19666,10 @@ async function discoverFunctionModules(obj) {
 		let match;
 		while ((match = regex.exec(responseStr)) !== null) fmNames.push({ name: match[1] });
 		const regex2 = /adtcore:name="([^"]+)"[^>]*type="FUGR\/FF"/g;
-		while ((match = regex2.exec(responseStr)) !== null) if (match?.[1] && !fmNames.some((f) => f.name === match[1])) fmNames.push({ name: match[1] });
+		while ((match = regex2.exec(responseStr)) !== null) {
+			const name = match[1];
+			if (name && !fmNames.some((f) => f.name === name)) fmNames.push({ name });
+		}
 		return fmNames;
 	} catch {
 		return [];
@@ -19694,7 +19699,13 @@ async function serializeFunctions(obj, fmItems) {
 }
 function extractFunctionDescriptors(functions) {
 	if (!functions) return [];
-	return (Array.isArray(functions) ? functions : Array.isArray(functions?.item) ? functions.item : functions?.item ? [functions.item] : []).map((fm) => ({
+	const functionsRecord = functions;
+	let items;
+	if (Array.isArray(functions)) items = functions;
+	else if (Array.isArray(functionsRecord?.item)) items = functionsRecord.item;
+	else if (functionsRecord?.item) items = [functionsRecord.item];
+	else items = [];
+	return items.map((fm) => ({
 		funcName: String(fm.FUNCNAME ?? ""),
 		shortText: fm.SHORT_TEXT ? String(fm.SHORT_TEXT) : void 0,
 		processingType: remoteCallToProcessingType(fm.REMOTE_CALL, fm.UPDATE_TASK),
@@ -19847,6 +19858,18 @@ const TYPEKIND_TO_REFTYPE = {
 	refToPredefinedAbapType: "E"
 };
 /**
+* Map abapGit REFKIND/REFTYPE back to the ADT `typeKind` enum.
+*/
+function typeKindFromRef(refKind, refType, dataType) {
+	if (refKind === "D") return "domain";
+	if (refKind === "R") return refType === "C" ? "refToClifType" : "refToDictionaryType";
+	return dataType ? "predefinedAbapType" : "domain";
+}
+/** Numeric DD04V field → number (empty/absent → 0). */
+function numOr0(value) {
+	return value ? Number(value) : 0;
+}
+/**
 * Derive OUTPUTLEN from ABAP data type + length + decimals.
 *
 * The ADT REST API for data elements does not return OUTPUTLEN — SAP derives
@@ -19929,12 +19952,7 @@ const dataElementHandler = createHandler(AdkDataElement, {
 		} };
 	},
 	fromAbapGit: ({ DD04V }) => {
-		const refKind = DD04V?.REFKIND ?? "";
-		const refType = DD04V?.REFTYPE ?? "";
-		let typeKind;
-		if (refKind === "D") typeKind = "domain";
-		else if (refKind === "R") typeKind = refType === "C" ? "refToClifType" : "refToDictionaryType";
-		else typeKind = DD04V?.DATATYPE ? "predefinedAbapType" : "domain";
+		const typeKind = typeKindFromRef(DD04V?.REFKIND ?? "", DD04V?.REFTYPE ?? "", DD04V?.DATATYPE);
 		return {
 			name: (DD04V?.ROLLNAME ?? "").toUpperCase(),
 			type: "DTEL/DE",
@@ -19946,22 +19964,22 @@ const dataElementHandler = createHandler(AdkDataElement, {
 				typeKind,
 				typeName: DD04V?.DOMNAME || "",
 				dataType: DD04V?.DATATYPE || "",
-				dataTypeLength: DD04V?.LENG ? Number(DD04V.LENG) : 0,
+				dataTypeLength: numOr0(DD04V?.LENG),
 				dataTypeLengthEnabled: false,
-				dataTypeDecimals: DD04V?.DECIMALS ? Number(DD04V.DECIMALS) : 0,
+				dataTypeDecimals: numOr0(DD04V?.DECIMALS),
 				dataTypeDecimalsEnabled: false,
 				shortFieldLabel: DD04V?.SCRTEXT_S || "",
-				shortFieldLength: DD04V?.SCRLEN1 ? Number(DD04V.SCRLEN1) : 0,
-				shortFieldMaxLength: DD04V?.SCRLEN1 ? Number(DD04V.SCRLEN1) : 0,
+				shortFieldLength: numOr0(DD04V?.SCRLEN1),
+				shortFieldMaxLength: numOr0(DD04V?.SCRLEN1),
 				mediumFieldLabel: DD04V?.SCRTEXT_M || "",
-				mediumFieldLength: DD04V?.SCRLEN2 ? Number(DD04V.SCRLEN2) : 0,
-				mediumFieldMaxLength: DD04V?.SCRLEN2 ? Number(DD04V.SCRLEN2) : 0,
+				mediumFieldLength: numOr0(DD04V?.SCRLEN2),
+				mediumFieldMaxLength: numOr0(DD04V?.SCRLEN2),
 				longFieldLabel: DD04V?.SCRTEXT_L || "",
-				longFieldLength: DD04V?.SCRLEN3 ? Number(DD04V.SCRLEN3) : 0,
-				longFieldMaxLength: DD04V?.SCRLEN3 ? Number(DD04V.SCRLEN3) : 0,
+				longFieldLength: numOr0(DD04V?.SCRLEN3),
+				longFieldMaxLength: numOr0(DD04V?.SCRLEN3),
 				headingFieldLabel: DD04V?.REPTEXT || "",
-				headingFieldLength: DD04V?.HEADLEN ? Number(DD04V.HEADLEN) : 0,
-				headingFieldMaxLength: DD04V?.HEADLEN ? Number(DD04V.HEADLEN) : 0,
+				headingFieldLength: numOr0(DD04V?.HEADLEN),
+				headingFieldMaxLength: numOr0(DD04V?.HEADLEN),
 				searchHelp: "",
 				searchHelpParameter: "",
 				setGetParameter: "",
@@ -20200,109 +20218,98 @@ function computeIntlen(builtin, length) {
 	if (builtin.length !== void 0) return builtin.length * 2;
 	return 0;
 }
-/** Build a DD03P entry from a single field definition */
-async function buildFieldDD03P(field, tableName, resolver) {
-	const isKey = field.isKey;
-	const notNull = field.notNull;
-	let rollname;
-	let comptype;
-	let inttype;
-	let intlen;
-	let datatype;
-	let leng;
-	let decimals;
-	let mask;
-	let shlporigin;
-	let reftable;
-	let reffield;
-	if (field.type.kind === "builtin") {
-		const bt = field.type;
-		const typeInfo = BUILTIN_TYPES[bt.name];
-		if (typeInfo) {
-			const length = bt.length ?? typeInfo.length;
-			inttype = typeInfo.inttype;
-			intlen = zeroPad(computeIntlen(typeInfo, length), 6);
-			datatype = typeInfo.datatype;
-			if (!typeInfo.noLeng && length !== void 0) leng = zeroPad(length, 6);
-			const dec = bt.decimals ?? typeInfo.decimals;
-			if (dec !== void 0) decimals = zeroPad(dec, 6);
-			mask = `  ${typeInfo.datatype}`;
-			if (typeInfo.shlporigin) shlporigin = typeInfo.shlporigin;
-			if (bt.name === "curr" || bt.name === "quan") {
-				const refAnnotation = getAnnotation(field.annotations, bt.name === "curr" ? "Semantics.amount.currencyCode" : "Semantics.quantity.unitOfMeasure");
-				if (refAnnotation) {
-					reftable = tableName;
-					const parts = refAnnotation.split(".");
-					reffield = parts[parts.length - 1].toUpperCase();
-				}
-			}
+/** Type columns derived from a builtin CDS type reference. */
+function builtinFieldColumns(bt, field, tableName) {
+	const typeInfo = BUILTIN_TYPES[bt.name];
+	if (!typeInfo) return {};
+	const out = {};
+	const length = bt.length ?? typeInfo.length;
+	out.inttype = typeInfo.inttype;
+	out.intlen = zeroPad(computeIntlen(typeInfo, length), 6);
+	out.datatype = typeInfo.datatype;
+	if (!typeInfo.noLeng && length !== void 0) out.leng = zeroPad(length, 6);
+	const dec = bt.decimals ?? typeInfo.decimals;
+	if (dec !== void 0) out.decimals = zeroPad(dec, 6);
+	out.mask = `  ${typeInfo.datatype}`;
+	if (typeInfo.shlporigin) out.shlporigin = typeInfo.shlporigin;
+	if (bt.name === "curr" || bt.name === "quan") {
+		const refAnnotation = getAnnotation(field.annotations, bt.name === "curr" ? "Semantics.amount.currencyCode" : "Semantics.quantity.unitOfMeasure");
+		if (refAnnotation) {
+			out.reftable = tableName;
+			out.reffield = refAnnotation.split(".").at(-1).toUpperCase();
 		}
-	} else {
-		rollname = field.type.name.toUpperCase();
-		comptype = "E";
-		if (resolver) {
-			const resolved = await resolver.resolve(field.type.name);
-			comptype = resolved.comptype;
-			if (resolved.shlporigin) shlporigin = resolved.shlporigin;
-			if (resolved.comptype === "S") {
-				datatype = "STRU";
-				mask = "  STRUS";
-			}
+	}
+	return out;
+}
+/** Type columns derived from a named type reference (resolved via ADT). */
+async function namedFieldColumns(field, resolver) {
+	const out = {
+		rollname: field.type.name.toUpperCase(),
+		comptype: "E"
+	};
+	if (resolver) {
+		const resolved = await resolver.resolve(field.type.name);
+		out.comptype = resolved.comptype;
+		if (resolved.shlporigin) out.shlporigin = resolved.shlporigin;
+		if (resolved.comptype === "S") {
+			out.datatype = "STRU";
+			out.mask = "  STRUS";
 		}
 	}
+	return out;
+}
+/**
+* Assemble the DD03P entry in standard abapGit DD03P field order.
+*
+* NOTE: POSITION is a real DD03P database value. abapGit emits it
+* inconsistently (only for some transparent tables). We omit it to
+* avoid roundtrip mismatches — SAP auto-computes it on import.
+*/
+function assembleDD03P(field, col) {
 	const result = {};
 	result.FIELDNAME = field.name.toUpperCase();
-	if (isKey) result.KEYFLAG = "X";
-	if (rollname) result.ROLLNAME = rollname;
+	if (field.isKey) result.KEYFLAG = "X";
+	if (col.rollname) result.ROLLNAME = col.rollname;
 	result.ADMINFIELD = "0";
-	if (inttype) result.INTTYPE = inttype;
-	if (intlen) result.INTLEN = intlen;
-	if (notNull) result.NOTNULL = "X";
-	if (datatype) result.DATATYPE = datatype;
-	if (leng) result.LENG = leng;
-	if (decimals) result.DECIMALS = decimals;
-	if (shlporigin) result.SHLPORIGIN = shlporigin;
-	if (reftable) result.REFTABLE = reftable;
-	if (reffield) result.REFFIELD = reffield;
-	if (mask) result.MASK = mask;
-	if (comptype) result.COMPTYPE = comptype;
+	if (col.inttype) result.INTTYPE = col.inttype;
+	if (col.intlen) result.INTLEN = col.intlen;
+	if (field.notNull) result.NOTNULL = "X";
+	if (col.datatype) result.DATATYPE = col.datatype;
+	if (col.leng) result.LENG = col.leng;
+	if (col.decimals) result.DECIMALS = col.decimals;
+	if (col.shlporigin) result.SHLPORIGIN = col.shlporigin;
+	if (col.reftable) result.REFTABLE = col.reftable;
+	if (col.reffield) result.REFFIELD = col.reffield;
+	if (col.mask) result.MASK = col.mask;
+	if (col.comptype) result.COMPTYPE = col.comptype;
 	return result;
 }
+/** Build a DD03P entry from a single field definition */
+async function buildFieldDD03P(field, tableName, resolver) {
+	return assembleDD03P(field, field.type.kind === "builtin" ? builtinFieldColumns(field.type, field, tableName) : await namedFieldColumns(field, resolver));
+}
+/** Build the DD03P entry for an INCLUDE directive (with or without suffix). */
+async function buildIncludeDD03P(inc, resolver) {
+	const includeName = inc.name.toUpperCase();
+	let ddtext;
+	if (resolver) ddtext = (await resolver.resolve(inc.name)).description;
+	const entry = {
+		FIELDNAME: inc.suffix ? `.INCLU-${inc.suffix.toUpperCase()}` : ".INCLUDE",
+		ADMINFIELD: "0",
+		PRECFIELD: includeName,
+		MASK: "      S",
+		COMPTYPE: "S"
+	};
+	if (ddtext) entry.DDTEXT = ddtext;
+	return entry;
+}
 /**
 * Build DD03P entries from table/structure members
 */
 async function buildDD03P(members, tableName = "", resolver) {
 	const entries = [];
-	for (const member of members) if ("kind" in member && member.kind === "include") {
-		const inc = member;
-		const includeName = inc.name.toUpperCase();
-		let ddtext;
-		if (resolver) ddtext = (await resolver.resolve(inc.name)).description;
-		if (inc.suffix) {
-			const entry = {
-				FIELDNAME: `.INCLU-${inc.suffix.toUpperCase()}`,
-				ADMINFIELD: "0",
-				PRECFIELD: includeName,
-				MASK: "      S",
-				COMPTYPE: "S"
-			};
-			if (ddtext) entry.DDTEXT = ddtext;
-			entries.push(entry);
-		} else {
-			const entry = {
-				FIELDNAME: ".INCLUDE",
-				ADMINFIELD: "0",
-				PRECFIELD: includeName,
-				MASK: "      S",
-				COMPTYPE: "S"
-			};
-			if (ddtext) entry.DDTEXT = ddtext;
-			entries.push(entry);
-		}
-	} else {
-		const field = member;
-		entries.push(await buildFieldDD03P(field, tableName, resolver));
-	}
+	for (const member of members) if ("kind" in member && member.kind === "include") entries.push(await buildIncludeDD03P(member, resolver));
+	else entries.push(await buildFieldDD03P(member, tableName, resolver));
 	return entries;
 }
 
@@ -20323,8 +20330,8 @@ const XML_NAMED_ENTITIES = {
 };
 function decodeNumericCode(decimal, hex) {
 	const base = decimal !== void 0 ? 10 : 16;
-	const value = decimal !== void 0 ? decimal : hex ?? "";
-	return String.fromCharCode(parseInt(value, base));
+	const value = decimal ?? hex ?? "";
+	return String.fromCodePoint(Number.parseInt(value, base));
 }
 function decodeXmlEntities(text) {
 	return text.replace(/&(?:#(\d+)|#x([0-9a-fA-F]+)|([a-zA-Z][a-zA-Z0-9]*));/g, (match, decimal, hex, name) => decimal !== void 0 || hex !== void 0 ? decodeNumericCode(decimal, hex) : XML_NAMED_ENTITIES[name] ?? match);
@@ -20367,7 +20374,7 @@ function parseSettingsToDD09L(settingsXml, def) {
 function resolveReferencedType(xml, comptype) {
 	const result = { comptype };
 	if (comptype === "E" && /<dtel:searchHelp>[^<]+<\/dtel:searchHelp>/.test(xml)) result.shlporigin = "D";
-	const descMatch = xml.match(/adtcore:description="([^"]+)"/);
+	const descMatch = /adtcore:description="([^"]+)"/.exec(xml);
 	if (descMatch) result.description = decodeXmlEntities(descMatch[1]);
 	return result;
 }
@@ -20891,7 +20898,7 @@ const serviceBindingHandler = createHandler("SRVB", {
 			services: binding?.services
 		};
 	},
-	async serialize(object, ctx, options) {
+	serialize(object, ctx, options) {
 		const objectName = ctx.getObjectName(object);
 		if (options?.format === "aff") {
 			const bindingType = String(object?.bindingType ?? object?.data?.bindingType ?? "odataV4");
@@ -20902,10 +20909,10 @@ const serviceBindingHandler = createHandler("SRVB", {
 				bindingTypeCategory,
 				...Array.isArray(services) && services.length > 0 ? { services } : {}
 			} });
-			return [ctx.createFile(`${objectName}.${ctx.fileExtension}.json`, jsonContent)];
+			return Promise.resolve([ctx.createFile(`${objectName}.${ctx.fileExtension}.json`, jsonContent)]);
 		}
 		const xmlContent = ctx.toAbapGitXml(object);
-		return [ctx.createFile(`${objectName}.${ctx.fileExtension}.xml`, xmlContent)];
+		return Promise.resolve([ctx.createFile(`${objectName}.${ctx.fileExtension}.xml`, xmlContent)]);
 	}
 });
 
@@ -21713,15 +21720,15 @@ const externalSchemaHandler = createHandler("DESD", {
 		} };
 	},
 	fromAffJson: (json) => affFromAffJson(json, ""),
-	async serialize(object, ctx) {
+	serialize(object, ctx) {
 		const header = {
 			description: object.description || String(object.name ?? ""),
 			originalLanguage: (object.originalLanguage ?? "en").toLowerCase()
 		};
-		return [ctx.createFile(`${ctx.getObjectName(object)}.desd.json`, `${JSON.stringify({
+		return Promise.resolve([ctx.createFile(`${ctx.getObjectName(object)}.desd.json`, `${JSON.stringify({
 			formatVersion: "1",
 			header
-		}, null, 2)}\n`)];
+		}, null, 2)}\n`)]);
 	}
 });
 
@@ -21751,15 +21758,15 @@ function createAffFirstHandler(type, ext) {
 			NAME: String(obj?.name ?? "").toUpperCase()
 		} }),
 		fromAffJson: (json) => affFromAffJson(json, ""),
-		async serialize(object, ctx) {
+		serialize(object, ctx) {
 			const header = {
 				description: object.description || String(object.name ?? ""),
 				originalLanguage: (object.originalLanguage ?? "en").toLowerCase()
 			};
-			return [ctx.createFile(`${ctx.getObjectName(object)}.${ext}.json`, `${JSON.stringify({
+			return Promise.resolve([ctx.createFile(`${ctx.getObjectName(object)}.${ext}.json`, `${JSON.stringify({
 				formatVersion: "1",
 				header
-			}, null, 2)}\n`)];
+			}, null, 2)}\n`)]);
 		}
 	});
 }
@@ -21837,12 +21844,19 @@ const httpServiceHandler = createHandler("HTTP", {
 	toAbapGit: (raw) => {
 		const obj = unwrapData(raw);
 		const name = String(obj.name ?? "").toUpperCase();
+		const lang = isoToSapLang(obj.masterLanguage || obj.language);
+		const handlerClassFallback = obj.handlerClass ? { UCONSERVHANDLER: {
+			ID: name,
+			VERSION: "A",
+			SERVICEORDER: obj.serviceOrder ?? "01",
+			SERVICEHANDLER: obj.handlerClass
+		} } : void 0;
 		return {
 			HTTPID: name,
 			HTTPTEXT: {
 				ID: name,
 				VERSION: "A",
-				LANG: isoToSapLang(obj.masterLanguage || obj.language),
+				LANG: lang,
 				SHORTTEXT: obj.description ?? ""
 			},
 			HTTPHDL: obj.handlers?.length ? { UCONSERVHANDLER: obj.handlers.map((h, i) => ({
@@ -21850,12 +21864,7 @@ const httpServiceHandler = createHandler("HTTP", {
 				VERSION: "A",
 				SERVICEORDER: h.serviceOrder ?? String(i + 1).padStart(2, "0"),
 				SERVICEHANDLER: h.handler
-			})) } : obj.handlerClass ? { UCONSERVHANDLER: {
-				ID: name,
-				VERSION: "A",
-				SERVICEORDER: obj.serviceOrder ?? "01",
-				SERVICEHANDLER: obj.handlerClass
-			} } : void 0
+			})) } : handlerClassFallback
 		};
 	},
 	fromAbapGit: ({ HTTPID, HTTPTEXT, HTTPHDL }) => {
@@ -21903,9 +21912,7 @@ const numberRangeObjectHandler = createHandler("NROB", {
 				CODE: obj.code,
 				GAP: obj.gap,
 				ROLLNR: obj.rollNr,
-				YEARLY: obj.yearly,
-				NRLVL: obj.nrLvl,
-				PROCIND: obj.procInd
+				YEARLY: obj.yearly
 			},
 			TEXT: {
 				LANGU: isoToSapLang(obj.masterLanguage || obj.language),
@@ -21929,9 +21936,7 @@ const numberRangeObjectHandler = createHandler("NROB", {
 		code: ATTRIBUTES?.CODE,
 		gap: ATTRIBUTES?.GAP,
 		rollNr: ATTRIBUTES?.ROLLNR,
-		yearly: ATTRIBUTES?.YEARLY,
-		nrLvl: ATTRIBUTES?.NRLVL,
-		procInd: ATTRIBUTES?.PROCIND
+		yearly: ATTRIBUTES?.YEARLY
 	})
 });
 
@@ -21949,6 +21954,11 @@ const changeDocumentObjectHandler = createHandler("CHDO", {
 	serializer_version: "v1.0.0",
 	toAbapGit: (obj) => {
 		const name = String(obj.name ?? "").toUpperCase();
+		const objectTextFallback = obj.description ? { TCDOBTS: [{
+			SPRAS: isoToSapLang(obj.masterLanguage || obj.language),
+			OBJECT: name,
+			OBTEXT: obj.description
+		}] } : void 0;
 		return { CHDO: {
 			REPORTS_GENERATED: obj.generatedReports?.length ? { TCDRPS: obj.generatedReports.map((r) => ({
 				OBJECT: r.object ?? name,
@@ -21967,11 +21977,7 @@ const changeDocumentObjectHandler = createHandler("CHDO", {
 				SPRAS: isoToSapLang(t.language || obj.masterLanguage || obj.language),
 				OBJECT: t.object ?? name,
 				OBTEXT: t.text
-			})) } : obj.description ? { TCDOBTS: [{
-				SPRAS: isoToSapLang(obj.masterLanguage || obj.language),
-				OBJECT: name,
-				OBTEXT: obj.description
-			}] } : void 0
+			})) } : objectTextFallback
 		} };
 	},
 	fromAbapGit: ({ CHDO }) => {
@@ -22208,7 +22214,8 @@ const icfServiceHandler = createHandler("SICF", {
 		const obj = unwrapData(raw);
 		const name = String(obj.name ?? "").toUpperCase();
 		const lang = isoToSapLang(obj.language);
-		const handlers = obj.handlers?.length ? obj.handlers : obj.handlerClass ? [{ handler: obj.handlerClass }] : [];
+		const fallbackHandlers = obj.handlerClass ? [{ handler: obj.handlerClass }] : [];
+		const handlers = obj.handlers?.length ? obj.handlers : fallbackHandlers;
 		return {
 			URL: obj.url ?? "",
 			ICFSERVICE: {
@@ -22811,11 +22818,11 @@ const mimeObjectHandler = createHandler("SMIM", {
 			PARENT_FOLDER_ID: obj.parentFolderId
 		}
 	}),
-	serialize: async (obj, ctx) => {
+	serialize: (obj, ctx) => {
 		const objectName = ctx.getObjectName(obj);
 		const files = [ctx.createFile(`${objectName}.smim.xml`, formatAbapGitXml(ctx.toAbapGitXml(obj)))];
 		if (obj.content && obj.fileName) files.push(ctx.createFile(`${objectName}.smim.${obj.fileName.toLowerCase()}`, obj.content, "base64"));
-		return files;
+		return Promise.resolve(files);
 	},
 	setSources: (obj, sources) => {
 		const data = unwrapData(obj);
@@ -23146,7 +23153,7 @@ const formHandler = createHandler("FORM", {
 			})) } : void 0
 		}] } };
 	},
-	serialize: async (obj, ctx) => {
+	serialize: (obj, ctx) => {
 		const objectName = ctx.getObjectName(obj);
 		const files = [ctx.createFile(`${objectName}.form.xml`, formatAbapGitXml(ctx.toAbapGitXml(obj)))];
 		for (const [lang, lines] of Object.entries(obj.tdlines ?? {})) {
@@ -23165,13 +23172,13 @@ const formHandler = createHandler("FORM", {
 			}, { pretty: true });
 			files.push(ctx.createFile(`${objectName}.form.tdlines_${isoToSapLang(lang).toLowerCase()}.xml`, formatAbapGitXml(xml)));
 		}
-		return files;
+		return Promise.resolve(files);
 	},
 	setSources: (obj, sources) => {
 		const data = unwrapData(obj);
 		const tdlinesData = data.tdlines ?? {};
 		for (const [key, content] of Object.entries(sources)) {
-			const match = key.match(/^tdlines_([a-zA-Z0-9]+)$/);
+			const match = /^tdlines_([a-zA-Z0-9]+)$/.exec(key);
 			if (!match) continue;
 			const parsed = tdlines.parse(content);
 			const items = normalizeItems(parsed.abapGit?.abap?.values?.TDLINES?.item);
@@ -24954,7 +24961,7 @@ const compositeTemplateHandler = createHandler("CMPT", {
 				NAME: String(obj.name ?? "").toUpperCase(),
 				DESCRIPTION: obj.description
 			},
-			...obj.extra ?? {}
+			...obj.extra
 		} };
 	},
 	fromAbapGit: ({ CMPT }) => {
@@ -25304,12 +25311,12 @@ const iatuHandler = createHandler("IATU", {
 			DEVCLASS: obj.packageName
 		} };
 	},
-	serialize: async (raw, ctx) => {
+	serialize: (raw, ctx) => {
 		const obj = unwrapData(raw);
 		const objectName = ctx.getObjectName(obj);
 		const files = [ctx.createFile(`${objectName}.iatu.xml`, formatAbapGitXml(ctx.toAbapGitXml(obj)))];
 		if (obj.html) files.push(ctx.createFile(`${objectName}.iatu.html`, obj.html));
-		return files;
+		return Promise.resolve(files);
 	},
 	setSources: (obj, sources) => {
 		const data = unwrapData(obj);
@@ -25390,7 +25397,7 @@ function createGenericObjslHandler(type, schema) {
 		serializer: `LCL_OBJECT_${type}`,
 		serializer_version: "v1.0.0",
 		toAbapGit: (raw) => {
-			return { ...unwrapData(raw).tables ?? {} };
+			return { ...unwrapData(raw).tables };
 		},
 		fromAbapGit: (values) => ({
 			name: "",
@@ -25426,20 +25433,20 @@ function createRawXmlHandler(type, schema) {
 		serializer: `LCL_OBJECT_${type}`,
 		serializer_version: "v1.0.0",
 		toAbapGit: (raw) => {
-			return { ...unwrapData(raw).raw ?? {} };
+			return { ...unwrapData(raw).raw };
 		},
 		fromAbapGit: (values) => ({
 			name: "",
 			raw: { ...values }
 		}),
-		serialize: async (obj, ctx) => {
+		serialize: (obj, ctx) => {
 			const xml = schema.build({
-				...obj.raw ?? {},
+				...obj.raw,
 				version: "v1.0.0",
 				serializer: `LCL_OBJECT_${type}`,
 				serializer_version: "v1.0.0"
 			});
-			return [ctx.createFile(`${ctx.getObjectName(obj)}.${ctx.fileExtension}.xml`, formatAbapGitXml(xml))];
+			return Promise.resolve([ctx.createFile(`${ctx.getObjectName(obj)}.${ctx.fileExtension}.xml`, formatAbapGitXml(xml))]);
 		}
 	});
 }
@@ -25620,7 +25627,7 @@ function generateAbapGitXml(folderLogic) {
 * plus source file extensions (.abap, .abdl, .acds, .asrvd).
 */
 function parseAbapGitFilename(filename) {
-	const match = filename.match(/^([^.]+)\.([^.]+)(?:\.([^.]+))?\.(xml|json|abap|abdl|acds|asrvd)$/);
+	const match = /^([^.]+)\.([^.]+)(?:\.([^.]+))?\.(xml|json|abap|abdl|acds|asrvd)$/.exec(filename);
 	if (!match) return null;
 	const [, name, type, suffixOrExt, extension] = match;
 	return {
@@ -25729,7 +25736,7 @@ function collectXmlCompanions(xmlFiles, objectMap) {
 function collectBinaryCompanions(allFiles, objectMap) {
 	for (const sourcePath of allFiles) {
 		const filename = sourcePath.slice(sourcePath.lastIndexOf("/") + 1);
-		const match = filename.match(/^([^.]+)\.([^.]+)\..+$/);
+		const match = /^([^.]+)\.([^.]+)\..+$/.exec(filename);
 		if (!match) continue;
 		const key = `${match[1].toUpperCase()}:${match[2].toUpperCase()}`;
 		const obj = objectMap.get(key);
@@ -25817,6 +25824,58 @@ function setAbapLanguageVersion(adkObject, options) {
 	if (data && !data.abapLanguageVersion) data.abapLanguageVersion = abapLangVerToAdt(options.abapLanguageVersion) ?? options.abapLanguageVersion;
 }
 /**
+* Read all source files of an object into a source-key → content map.
+* Binary companions travel base64-encoded.
+*/
+async function loadObjectSources(fileTree, objFiles, handler) {
+	const contents = await Promise.all(objFiles.sourceFiles.map(({ path, binary }) => binary ? fileTree.readBuffer(path).then((buffer) => buffer.toString("base64")) : fileTree.read(path)));
+	const sources = {};
+	for (const [index, { suffix }] of objFiles.sourceFiles.entries()) {
+		const sourceKey = suffix ? handler.suffixToSourceKey?.[suffix] ?? suffix : "main";
+		sources[sourceKey] = contents[index];
+	}
+	return sources;
+}
+/**
+* Compute the relative directory for package resolution and attach the
+* folder-logic hints to the ADK object.
+*/
+function applyFolderInfo(adkObject, objFiles, folderConfig) {
+	if (!folderConfig.hasAbapGitXml) return;
+	const sourceDir = (objFiles.xmlFile ?? objFiles.jsonFile ?? "").split("/").slice(0, -1).join("/");
+	adkObject._relDir = sourceDir.startsWith(folderConfig.startDir) ? sourceDir.slice(folderConfig.startDir.length).replace(/^\/+/, "") : sourceDir;
+	adkObject._folderLogic = folderConfig.folderLogic;
+}
+/**
+* Build one object (plus its FUGR children) from a metadata/source file
+* group. A failure inside one object is logged and swallowed, mirroring
+* the abapGit log-and-continue rule.
+*/
+async function* buildObject(fileTree, adk, objFiles, handler, options, folderConfig) {
+	try {
+		const meta = await parseMetadata(fileTree, objFiles, handler);
+		if (!meta) return;
+		const { values, isAffJson } = meta;
+		const sources = await loadObjectSources(fileTree, objFiles, handler);
+		const payload = buildPayload(handler, values, isAffJson, objFiles);
+		const objectName = payload.name || objFiles.name;
+		const adkType = typeof payload.type === "string" ? payload.type : objFiles.type;
+		const adkObject = adk.getWithData({
+			...payload,
+			name: objectName
+		}, adkType);
+		setObjectSources(handler, adkObject, sources);
+		if (payload.description) adkObject._pendingDescription = payload.description;
+		applyFolderInfo(adkObject, objFiles, folderConfig);
+		resolvePackageRef(adkObject, options, folderConfig.hasAbapGitXml, folderConfig.folderLogic);
+		setAbapLanguageVersion(adkObject, options);
+		yield adkObject;
+		if (objFiles.type === "FUGR" && payload._functions) yield* yieldFugrChildren(adk, payload, objectName, options, adkObject);
+	} catch (error) {
+		console.error(`Failed to deserialize ${objFiles.type} ${objFiles.name}:`, error);
+	}
+}
+/**
 * Deserialize abapGit files to ADK objects
 *
 * True generator - yields objects one at a time as they're discovered.
@@ -25843,37 +25902,11 @@ async function* deserialize(fileTree, client, options) {
 		if (!objFiles.xmlFile && !objFiles.jsonFile) continue;
 		const handler = getHandler(objFiles.type);
 		if (!handler) continue;
-		try {
-			const meta = await parseMetadata(fileTree, objFiles, handler);
-			if (!meta) continue;
-			const { values, isAffJson } = meta;
-			const sources = {};
-			for (const { path, suffix, binary } of objFiles.sourceFiles) {
-				const content = binary ? (await fileTree.readBuffer(path)).toString("base64") : await fileTree.read(path);
-				const sourceKey = suffix ? handler.suffixToSourceKey?.[suffix] ?? suffix : "main";
-				sources[sourceKey] = content;
-			}
-			const payload = buildPayload(handler, values, isAffJson, objFiles);
-			const objectName = payload.name || objFiles.name;
-			const adkType = typeof payload.type === "string" ? payload.type : objFiles.type;
-			const adkObject = adk.getWithData({
-				...payload,
-				name: objectName
-			}, adkType);
-			setObjectSources(handler, adkObject, sources);
-			if (payload.description) adkObject._pendingDescription = payload.description;
-			if (hasAbapGitXml) {
-				const sourceDir = (objFiles.xmlFile ?? objFiles.jsonFile ?? "").split("/").slice(0, -1).join("/");
-				adkObject._relDir = sourceDir.startsWith(startDir) ? sourceDir.slice(startDir.length).replace(/^\/+/, "") : sourceDir;
-				adkObject._folderLogic = folderLogic;
-			}
-			resolvePackageRef(adkObject, options, hasAbapGitXml, folderLogic);
-			setAbapLanguageVersion(adkObject, options);
-			yield adkObject;
-			if (objFiles.type === "FUGR" && payload._functions) yield* yieldFugrChildren(adk, payload, objectName, options, adkObject);
-		} catch (error) {
-			console.error(`Failed to deserialize ${objFiles.type} ${objFiles.name}:`, error);
-		}
+		yield* buildObject(fileTree, adk, objFiles, handler, options, {
+			hasAbapGitXml,
+			startDir,
+			folderLogic
+		});
 	}
 }
 /**
@@ -25950,7 +25983,10 @@ async function buildMaterializedFiles(handler, object, packageDir, sources, form
 			path,
 			...classification
 		};
-	}).sort((left, right) => left.path < right.path ? -1 : left.path > right.path ? 1 : 0);
+	}).sort((left, right) => {
+		if (left.path < right.path) return -1;
+		return left.path > right.path ? 1 : 0;
+	});
 }
 const abapgitFormatPlugin = {
 	id: "abapgit",
@@ -26175,7 +26211,7 @@ const abapGitPlugin = createPlugin({
 		* PROG deletions without obj_func=D), no files are present and nothing
 		* happens. This is expected behavior.
 		*/
-		async delete(objectRef, targetPath, _context) {
+		delete(objectRef, targetPath, _context) {
 			try {
 				const srcDir = resolve(targetPath, "src");
 				const matchedFiles = findObjectFiles(srcDir, objectRef.name, objectRef.type);
@@ -26192,21 +26228,21 @@ const abapGitPlugin = createPlugin({
 					errors.push(error instanceof Error ? `Failed to delete ${relative(targetPath, filePath)}: ${error.message}` : `Failed to delete ${relative(targetPath, filePath)}: ${String(error)}`);
 				}
 				srcDirIndexCache.get(srcDir)?.set(`${objectRef.name.toLowerCase()}.${objectRef.type.toLowerCase()}.`, matchedFiles.filter((filePath) => existsSync(filePath)));
-				return {
+				return Promise.resolve({
 					success: errors.length === 0,
 					filesRemoved,
 					...errors.length > 0 ? { errors } : {}
-				};
+				});
 			} catch (error) {
-				return {
+				return Promise.resolve({
 					success: false,
 					filesRemoved: [],
 					errors: [error instanceof Error ? error.message : String(error)]
-				};
+				});
 			}
 		}
 	},
-	hooks: { async afterImport(targetPath) {
+	hooks: { afterImport(targetPath) {
 		const target = resolve(targetPath);
 		const folderLogic = folderLogicByTarget.get(target) ?? readFolderLogicFromExistingRepo(targetPath) ?? "prefix";
 		try {
@@ -26217,6 +26253,7 @@ const abapGitPlugin = createPlugin({
 			folderLogicByTarget.delete(target);
 			srcDirIndexCache.delete(resolve(targetPath, "src"));
 		}
+		return Promise.resolve();
 	} }
 });