@wictorwilen/cocogen 1.0.18 → 1.0.20

package/CHANGELOG.md

@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.20] - 2026-01-21
+
+### Changed
+- Principal properties now emit a typed principal object with `@odata.type`, `userPrincipalName`, and `tenantId` mappings.
+- Added support for `coco.Principal[]` mapping to Graph `principalCollection` (preview).
+
+### Fixed
+- .NET CLI now uses client secret credentials directly when configured (avoids managed identity failures).
+- TS CLI now uses client secret credentials directly when configured (avoids managed identity failures).
+
+## [1.0.19] - 2026-01-21
+
+### Fixed
+- Clarified error messaging for unsupported scalar types (with float64 hint).
+
+### Changed
+- Moved item payload ID encoding helpers into shared core helpers for TS and .NET.
+
 ## [1.0.18] - 2026-01-21
 
 ### Breaking Changes
@@ -40,6 +58,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Collection values no longer split on commas; use semicolons instead.
 
 [Unreleased]: https://github.com/wictorwilen/cocogen/compare/v1.0.16...HEAD
+[1.0.20]: https://github.com/wictorwilen/cocogen/compare/main...v1.0.20
+[1.0.19]: https://github.com/wictorwilen/cocogen/compare/main...v1.0.19
 [1.0.18]: https://github.com/wictorwilen/cocogen/compare/main...v1.0.18
 [1.0.17]: https://github.com/wictorwilen/cocogen/compare/main...v1.0.17
 [1.0.16]: https://github.com/wictorwilen/cocogen/compare/main...v1.0.16

package/README.md

@@ -31,6 +31,7 @@
 
 End-user guide:
 - [docs/end-user.md](https://github.com/wictorwilen/cocogen/blob/main/docs/end-user.md)
+
 Agent schema guidance:
 - [docs/schema-assistant.md](https://github.com/wictorwilen/cocogen/blob/main/docs/schema-assistant.md)
 

package/dist/init/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/init/init.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAgB,MAAM,UAAU,CAAC;AAK1D,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AA2zCF,wBAAsB,eAAe,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,WAAW,CAAA;CAAE,CAAC,CAyB1G;AAED,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,WAAW,CAAA;CAAE,CAAC,CA2B9C;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,WAAW,CAAA;CAAE,CAAC,CAOxG;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,WAAW,CAAA;CAAE,CAAC,CAsHtG;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,WAAW,CAAA;CAAE,CAAC,CAoH9C"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/init/init.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAgB,MAAM,UAAU,CAAC;AAK1D,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AA2kDF,wBAAsB,eAAe,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,WAAW,CAAA;CAAE,CAAC,CAyB1G;AAED,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,WAAW,CAAA;CAAE,CAAC,CA2B9C;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,WAAW,CAAA;CAAE,CAAC,CAOxG;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,WAAW,CAAA;CAAE,CAAC,CAsHtG;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,WAAW,CAAA;CAAE,CAAC,CAoH9C"}

package/dist/init/init.js

@@ -36,7 +36,9 @@ function toTsType(type) {
         case "dateTimeCollection":
             return "string[]";
         case "principal":
-            return "string";
+            return "Principal";
+        case "principalCollection":
+            return "Principal[]";
         default:
             return "unknown";
     }
@@ -44,8 +46,11 @@ function toTsType(type) {
 function toCsType(type) {
     switch (type) {
         case "string":
-        case "principal":
             return "string";
+        case "principal":
+            return "Principal";
+        case "principalCollection":
+            return "List<Principal>";
         case "boolean":
             return "bool";
         case "int64":
@@ -232,6 +237,8 @@ async function writeGeneratedTs(outDir, ir, schemaFolderName) {
                     return "parseNumberCollection";
                 case "dateTimeCollection":
                     return "parseStringCollection";
+                case "principalCollection":
+                    return "parseStringCollection";
                 case "boolean":
                     return "parseBoolean";
                 case "int64":
@@ -267,16 +274,23 @@ async function writeGeneratedTs(outDir, ir, schemaFolderName) {
                         : base;
                 }))
             : null;
+        const principalExpression = p.type === "principal"
+            ? buildTsPrincipalExpression(p.personEntity?.fields ?? null, p.source.csvHeaders)
+            : p.type === "principalCollection"
+                ? buildTsPrincipalCollectionExpression(p.personEntity?.fields ?? null, p.source.csvHeaders)
+                : null;
         const isPeopleLabel = p.labels.some((label) => label.startsWith("person"));
         const needsManualEntity = isPeopleLabel && !p.personEntity;
         const noSource = Boolean(p.source.noSource);
         const expression = needsManualEntity
             ? `(() => { throw new Error("Missing @coco.source(..., to) mappings for people entity '${p.name}'. Implement transform in propertyTransform.ts."); })()`
-            : personEntity
-                ? personEntity
-                : noSource
-                    ? `undefined as unknown as ${toTsType(p.type)}`
-                    : `${parser}(readSourceValue(row, ${JSON.stringify(p.source.csvHeaders)}))`;
+            : noSource
+                ? `undefined as unknown as ${toTsType(p.type)}`
+                : (p.type === "principal" || p.type === "principalCollection") && principalExpression
+                    ? principalExpression
+                    : personEntity
+                        ? personEntity
+                        : `${parser}(readSourceValue(row, ${JSON.stringify(p.source.csvHeaders)}))`;
         const validationMetadata = {
             name: p.name,
             type: p.type,
@@ -287,7 +301,7 @@ async function writeGeneratedTs(outDir, ir, schemaFolderName) {
             ...(p.minValue !== undefined ? { minValue: p.minValue } : {}),
             ...(p.maxValue !== undefined ? { maxValue: p.maxValue } : {}),
         };
-        const validatedExpression = needsManualEntity || noSource || personEntity
+        const validatedExpression = needsManualEntity || noSource || personEntity || p.type === "principal" || p.type === "principalCollection"
             ? expression
             : applyTsValidationExpression(validationMetadata, expression);
         return {
@@ -304,10 +318,12 @@ async function writeGeneratedTs(outDir, ir, schemaFolderName) {
     const idRawExpression = idRawHeaders.length
         ? `parseString(readSourceValue(row, ${JSON.stringify(idRawHeaders)}))`
         : '""';
+    const usesPrincipal = ir.properties.some((p) => p.type === "principal" || p.type === "principalCollection");
     await writeFile(path.join(outDir, "src", schemaFolderName, "model.ts"), await renderTemplate("ts/src/generated/model.ts.ejs", {
         itemTypeName: ir.item.typeName,
         properties: modelProperties,
         itemDocComment: ir.item.doc ? formatDocComment(ir.item.doc) : undefined,
+        usesPrincipal,
     }), "utf8");
     await writeFile(path.join(outDir, "src", "datasource", "row.ts"), await renderTemplate("ts/src/generated/row.ts.ejs", {}), "utf8");
     await writeFile(path.join(outDir, "src", schemaFolderName, "constants.ts"), await renderTemplate("ts/src/generated/constants.ts.ejs", {
@@ -328,6 +344,7 @@ async function writeGeneratedTs(outDir, ir, schemaFolderName) {
     }), "utf8");
     await writeFile(path.join(outDir, "src", schemaFolderName, "propertyTransformBase.ts"), await renderTemplate("ts/src/generated/propertyTransformBase.ts.ejs", {
         properties: transformProperties,
+        usesPrincipal,
     }), "utf8");
     const transformOverridesPath = path.join(outDir, "src", schemaFolderName, "propertyTransform.ts");
     try {
@@ -340,6 +357,7 @@ async function writeGeneratedTs(outDir, ir, schemaFolderName) {
         properties: transformProperties,
         itemTypeName: ir.item.typeName,
         idRawExpression,
+        usesPrincipal,
     }), "utf8");
     const propertiesObjectLines = ir.properties
         .filter((p) => p.name !== ir.item.contentPropertyName)
@@ -369,6 +387,10 @@ async function writeGeneratedTs(outDir, ir, schemaFolderName) {
         isPeopleConnector: ir.connection.contentCategory === "people",
     }), "utf8");
     await writeFile(path.join(outDir, "src", "core", "validation.ts"), await renderTemplate("ts/src/core/validation.ts.ejs", {}), "utf8");
+    await writeFile(path.join(outDir, "src", "core", "itemId.ts"), await renderTemplate("ts/src/core/itemId.ts.ejs", {}), "utf8");
+    if (usesPrincipal) {
+        await writeFile(path.join(outDir, "src", "core", "principal.ts"), await renderTemplate("ts/src/core/principal.ts.ejs", {}), "utf8");
+    }
 }
 function toGraphPropertyTypeEnumName(type) {
     switch (type) {
@@ -392,6 +414,8 @@ function toGraphPropertyTypeEnumName(type) {
             return "DateTimeCollection";
         case "principal":
             return "Principal";
+        case "principalCollection":
+            return "PrincipalCollection";
         default:
             return "String";
     }
@@ -429,6 +453,7 @@ function toCsParseFunction(type) {
         case "dateTime":
             return "RowParser.ParseDateTime";
         case "principal":
+        case "principalCollection":
         case "string":
         default:
             return "RowParser.ParseString";
@@ -549,6 +574,151 @@ ${indentUnit}}`;
         : "const lengths = [0];";
     return `(() => {\n${fieldLines.join("\n")}\n${lengthVars}\n  const maxLen = Math.max(0, ...lengths);\n  const getValue = (values: string[], index: number): string => {\n    if (values.length === 0) return \"\";\n    if (values.length === 1) return values[0] ?? \"\";\n    return values[index] ?? \"\";\n  };\n  const results: string[] = [];\n  for (let index = 0; index < maxLen; index++) {\n    results.push(JSON.stringify(\n      ${renderNodeMany(tree)}\n    ));\n  }\n  return results;\n})()`;
 }
+function buildPrincipalFieldEntries(fields, fallbackHeaders) {
+    if (fields && fields.length > 0) {
+        return fields
+            .map((field) => {
+            const key = field.path.split(".").pop() ?? field.path;
+            return {
+                key,
+                headersLiteral: JSON.stringify(field.source.csvHeaders),
+            };
+        })
+            .filter((entry) => entry.headersLiteral.length > 2 && entry.key.length > 0);
+    }
+    if (fallbackHeaders.length > 0) {
+        return [
+            {
+                key: "userPrincipalName",
+                headersLiteral: JSON.stringify([fallbackHeaders[0]]),
+            },
+        ];
+    }
+    return [];
+}
+function buildTsPrincipalExpression(fields, fallbackHeaders) {
+    const entries = buildPrincipalFieldEntries(fields, fallbackHeaders).map((entry) => `  ${JSON.stringify(entry.key)}: parseString(readSourceValue(row, ${entry.headersLiteral}))`);
+    return `({\n  "@odata.type": "#microsoft.graph.externalConnectors.principal"${entries.length ? ",\n" + entries.join(",\n") : ""}\n})`;
+}
+function buildCsPrincipalExpression(fields, fallbackHeaders) {
+    const entries = buildPrincipalFieldEntries(fields, fallbackHeaders);
+    const knownMap = new Map([
+        ["userPrincipalName", "UserPrincipalName"],
+        ["tenantId", "TenantId"],
+        ["id", "Id"],
+        ["type", "Type"],
+        ["displayName", "DisplayName"],
+    ]);
+    const knownAssignments = [];
+    const additionalDataEntries = [];
+    for (const entry of entries) {
+        const headers = `new[] { ${JSON.parse(entry.headersLiteral).map((h) => JSON.stringify(h)).join(", ")} }`;
+        const propertyName = knownMap.get(entry.key);
+        if (propertyName) {
+            knownAssignments.push(`    ${propertyName} = RowParser.ParseString(row, ${headers}),`);
+        }
+        else {
+            additionalDataEntries.push(`        [${JSON.stringify(entry.key)}] = RowParser.ParseString(row, ${headers}),`);
+        }
+    }
+    const additionalDataBlock = additionalDataEntries.length
+        ? [
+            "    AdditionalData = new Dictionary<string, object?>",
+            "    {",
+            ...additionalDataEntries,
+            "    },",
+        ]
+        : [];
+    return [
+        "new Principal",
+        "{",
+        "    OdataType = \"#microsoft.graph.externalConnectors.principal\",",
+        ...knownAssignments,
+        ...additionalDataBlock,
+        "}"
+    ].join("\n");
+}
+function buildTsPrincipalCollectionExpression(fields, fallbackHeaders) {
+    const entries = buildPrincipalFieldEntries(fields, fallbackHeaders);
+    if (entries.length === 0)
+        return "[]";
+    const fieldLines = entries.map((entry, index) => `  const field${index} = parseStringCollection(readSourceValue(row, ${entry.headersLiteral}));`);
+    const lengthVars = entries.length
+        ? `  const lengths = [${entries.map((_, index) => `field${index}.length`).join(", ")}];`
+        : "  const lengths = [0];";
+    const fieldsBlock = entries
+        .map((entry, index) => `      ${JSON.stringify(entry.key)}: getValue(field${index}, index)`)
+        .join(",\n");
+    return `(() => {\n${fieldLines.join("\n")}\n${lengthVars}\n  const maxLen = Math.max(0, ...lengths);\n  const getValue = (values: string[], index: number): string => {\n    if (values.length === 0) return "";\n    if (values.length === 1) return values[0] ?? "";\n    return values[index] ?? "";\n  };\n  const results: Principal[] = [];\n  for (let index = 0; index < maxLen; index++) {\n    results.push({\n      "@odata.type": "#microsoft.graph.externalConnectors.principal",\n${fieldsBlock}\n    });\n  }\n  return results;\n})()`;
+}
+function buildCsPrincipalCollectionExpression(fields, fallbackHeaders) {
+    const entries = buildPrincipalFieldEntries(fields, fallbackHeaders);
+    if (entries.length === 0)
+        return "new List<Principal>()";
+    const fieldLines = entries.map((entry, index) => {
+        const headers = `new[] { ${JSON.parse(entry.headersLiteral).map((h) => JSON.stringify(h)).join(", ")} }`;
+        return `        var field${index} = RowParser.ParseStringCollection(row, ${headers});`;
+    });
+    const knownMap = new Map([
+        ["userPrincipalName", "UserPrincipalName"],
+        ["tenantId", "TenantId"],
+        ["id", "Id"],
+        ["type", "Type"],
+        ["displayName", "DisplayName"],
+    ]);
+    const knownAssignments = entries
+        .map((entry, index) => {
+        const propertyName = knownMap.get(entry.key);
+        return propertyName ? `                ${propertyName} = GetValue(field${index}, index),` : null;
+    })
+        .filter((line) => Boolean(line));
+    const additionalDataEntries = entries
+        .map((entry, index) => {
+        if (knownMap.has(entry.key))
+            return null;
+        return `                    [${JSON.stringify(entry.key)}] = GetValue(field${index}, index),`;
+    })
+        .filter((line) => Boolean(line));
+    const additionalDataBlock = additionalDataEntries.length
+        ? [
+            "                AdditionalData = new Dictionary<string, object?>",
+            "                {",
+            ...additionalDataEntries,
+            "                },",
+        ]
+        : [];
+    const lengthsLine = entries.map((_, index) => `field${index}.Count`).join(", ");
+    return [
+        "new Func<List<Principal>>(() =>",
+        "{",
+        ...fieldLines,
+        `        var lengths = new[] { ${lengthsLine} };`,
+        "        var maxLen = 0;",
+        "        foreach (var len in lengths)",
+        "        {",
+        "            if (len > maxLen) maxLen = len;",
+        "        }",
+        "        string GetValue(IReadOnlyList<string> values, int index)",
+        "        {",
+        "            if (values.Count == 0) return \"\";",
+        "            if (values.Count == 1) return values[0] ?? \"\";",
+        "            return index < values.Count ? (values[index] ?? \"\") : \"\";",
+        "        }",
+        "        var results = new List<Principal>();",
+        "        for (var index = 0; index < maxLen; index++)",
+        "        {",
+        "            var principal = new Principal",
+        "            {",
+        "                OdataType = \"#microsoft.graph.externalConnectors.principal\",",
+        ...knownAssignments,
+        ...additionalDataBlock,
+        "            };",
+        "            results.Add(principal);",
+        "        }",
+        "        return results;",
+        "})()",
+    ].join("\n");
+}
 function buildCsPersonEntityExpression(fields, valueExpressionBuilder = (headersLiteral) => `RowParser.ParseString(row, ${headersLiteral})`) {
     const tree = buildObjectTree(fields);
     const indentUnit = "    ";
@@ -641,6 +811,8 @@ function sampleValueForType(type) {
             return "2024-01-01T00:00:00Z;2024-01-02T00:00:00Z";
         case "principal":
             return 'alice@contoso.com';
+        case "principalCollection":
+            return "alice@contoso.com;bob@contoso.com";
         case "string":
         default:
             return "sample";
@@ -727,7 +899,7 @@ function applyCsValidationExpression(prop, expression, csvHeadersLiteral) {
         case "dateTimeCollection":
             if (!stringConstraints.hasAny)
                 return expression;
-            return `ValidateDateTimeCollection(${nameLiteral}, RowParser.ReadValue(row, ${csvHeadersLiteral}), ${stringConstraints.minLength}, ${stringConstraints.maxLength}, ${stringConstraints.pattern}, ${stringConstraints.format})`;
+            return `Validation.ValidateStringCollection(${nameLiteral}, RowParser.ParseStringCollection(RowParser.ReadValue(row, ${csvHeadersLiteral})), ${stringConstraints.minLength}, ${stringConstraints.maxLength}, ${stringConstraints.pattern}, ${stringConstraints.format}).Select(value => RowParser.ParseDateTime(value)).ToList()`;
         case "int64":
             return numberConstraints.hasAny
                 ? `Validation.ValidateInt64(${nameLiteral}, ${expression}, ${numberConstraints.minValue}, ${numberConstraints.maxValue})`
@@ -871,25 +1043,32 @@ async function writeGeneratedDotnet(outDir, ir, namespaceName, schemaFolderName,
         const isPeopleLabel = p.labels.some((label) => label.startsWith("person"));
         const needsManualEntity = isPeopleLabel && !p.personEntity;
         const noSource = Boolean(p.source.noSource);
+        const principalExpression = p.type === "principal"
+            ? buildCsPrincipalExpression(p.personEntity?.fields ?? null, p.source.csvHeaders)
+            : p.type === "principalCollection"
+                ? buildCsPrincipalCollectionExpression(p.personEntity?.fields ?? null, p.source.csvHeaders)
+                : null;
         const transformExpression = needsManualEntity
             ? `throw new NotImplementedException("Missing @coco.source(..., to) mappings for people entity '${p.name}'. Implement in PropertyTransform.cs.")`
-            : personEntity
-                ? isCollection
-                    ? buildCsPersonEntityCollectionExpression(personEntity.fields, (headersLiteral) => {
-                        const base = `RowParser.ParseStringCollection(row, ${headersLiteral})`;
-                        return csStringConstraints.hasAny
-                            ? `Validation.ValidateStringCollection(${nameLiteral}, ${base}, ${csStringConstraints.minLength}, ${csStringConstraints.maxLength}, ${csStringConstraints.pattern}, ${csStringConstraints.format})`
-                            : base;
-                    })
-                    : buildCsPersonEntityExpression(personEntity.fields, (headersLiteral) => {
-                        const base = `RowParser.ParseString(row, ${headersLiteral})`;
-                        return csStringConstraints.hasAny
-                            ? `Validation.ValidateString(${nameLiteral}, ${base}, ${csStringConstraints.minLength}, ${csStringConstraints.maxLength}, ${csStringConstraints.pattern}, ${csStringConstraints.format})`
-                            : base;
-                    })
-                : noSource
-                    ? "default!"
-                    : `${parseFn}(row, ${csvHeadersLiteral})`;
+            : noSource
+                ? "default!"
+                : (p.type === "principal" || p.type === "principalCollection") && principalExpression
+                    ? principalExpression
+                    : personEntity
+                        ? isCollection
+                            ? buildCsPersonEntityCollectionExpression(personEntity.fields, (headersLiteral) => {
+                                const base = `RowParser.ParseStringCollection(row, ${headersLiteral})`;
+                                return csStringConstraints.hasAny
+                                    ? `Validation.ValidateStringCollection(${nameLiteral}, ${base}, ${csStringConstraints.minLength}, ${csStringConstraints.maxLength}, ${csStringConstraints.pattern}, ${csStringConstraints.format})`
+                                    : base;
+                            })
+                            : buildCsPersonEntityExpression(personEntity.fields, (headersLiteral) => {
+                                const base = `RowParser.ParseString(row, ${headersLiteral})`;
+                                return csStringConstraints.hasAny
+                                    ? `Validation.ValidateString(${nameLiteral}, ${base}, ${csStringConstraints.minLength}, ${csStringConstraints.maxLength}, ${csStringConstraints.pattern}, ${csStringConstraints.format})`
+                                    : base;
+                            })
+                        : `${parseFn}(row, ${csvHeadersLiteral})`;
         const validationMetadata = {
             name: p.name,
             type: p.type,
@@ -900,7 +1079,7 @@ async function writeGeneratedDotnet(outDir, ir, namespaceName, schemaFolderName,
             ...(p.minValue !== undefined ? { minValue: p.minValue } : {}),
             ...(p.maxValue !== undefined ? { maxValue: p.maxValue } : {}),
         };
-        const validatedExpression = needsManualEntity || noSource || personEntity
+        const validatedExpression = needsManualEntity || noSource || personEntity || p.type === "principal" || p.type === "principalCollection"
             ? transformExpression
             : applyCsValidationExpression(validationMetadata, transformExpression, csvHeadersLiteral);
         return {
@@ -944,6 +1123,7 @@ async function writeGeneratedDotnet(outDir, ir, namespaceName, schemaFolderName,
     const schemaPropertyLines = properties
         .filter((p) => p.name !== ir.item.contentPropertyName)
         .map((p) => {
+        const isPrincipalCollection = ir.connection.graphApiVersion === "beta" && p.type === "principalCollection";
         const labels = p.labels.length > 0
             ? `new List<string> { ${p.labels.map((l) => JSON.stringify(l)).join(", ")} }`
             : null;
@@ -955,6 +1135,8 @@ async function writeGeneratedDotnet(outDir, ir, namespaceName, schemaFolderName,
             additionalDataEntries.push(`                        ["description"] = ${JSON.stringify(p.description)},`);
         if (labels)
             additionalDataEntries.push(`                        ["labels"] = ${labels},`);
+        if (isPrincipalCollection)
+            additionalDataEntries.push(`                        ["type"] = "principalCollection",`);
         const additionalDataBlock = additionalDataEntries.length > 0
             ? [
                 "                    AdditionalData = new Dictionary<string, object>",
@@ -967,7 +1149,7 @@ async function writeGeneratedDotnet(outDir, ir, namespaceName, schemaFolderName,
             "                new Property",
             "                {",
             `                    Name = ${JSON.stringify(p.name)},`,
-            `                    Type = PropertyType.${p.graphTypeEnumName},`,
+            ...(isPrincipalCollection ? [] : [`                    Type = PropertyType.${p.graphTypeEnumName},`]),
         ];
         if (p.search.searchable !== undefined)
             lines.push(`                    IsSearchable = ${p.search.searchable ? "true" : "false"},`);
@@ -1027,11 +1209,15 @@ async function writeGeneratedDotnet(outDir, ir, namespaceName, schemaFolderName,
         `            Value = ${contentValueExpression},`,
         "        };",
     ].join("\n");
+    const usesPrincipal = properties.some((p) => p.type === "principal" || p.type === "principalCollection");
     await writeFile(path.join(outDir, schemaFolderName, "Model.cs"), await renderTemplate("dotnet/Generated/Model.cs.ejs", {
+        namespaceName,
         schemaNamespace,
         itemTypeName: ir.item.typeName,
         properties: properties.map((p) => ({ csName: p.csName, csType: p.csType })),
         recordDocLines,
+        graphApiVersion: ir.connection.graphApiVersion,
+        usesPrincipal,
     }), "utf8");
     await writeFile(path.join(outDir, schemaFolderName, "Constants.cs"), await renderTemplate("dotnet/Generated/Constants.cs.ejs", {
         schemaNamespace,
@@ -1060,6 +1246,11 @@ async function writeGeneratedDotnet(outDir, ir, namespaceName, schemaFolderName,
         schemaNamespace,
         properties,
         usesPersonEntity: properties.some((p) => p.personEntity),
+        usesLinq: properties.some((p) => p.type === "dateTimeCollection" &&
+            (p.minLength !== undefined ||
+                p.maxLength !== undefined ||
+                Boolean(p.pattern?.regex) ||
+                Boolean(p.format))),
     }), "utf8");
     const transformOverridesPath = path.join(outDir, schemaFolderName, "PropertyTransform.cs");
     try {
@@ -1075,8 +1266,11 @@ async function writeGeneratedDotnet(outDir, ir, namespaceName, schemaFolderName,
         schemaNamespace,
         itemTypeName: ir.item.typeName,
         constructorArgLines,
+        usesPrincipal,
+        graphApiVersion: ir.connection.graphApiVersion,
     }), "utf8");
     await writeFile(path.join(outDir, schemaFolderName, "ItemPayload.cs"), await renderTemplate("dotnet/Generated/ItemPayload.cs.ejs", {
+        namespaceName,
         schemaNamespace,
         itemTypeName: ir.item.typeName,
         itemIdExpression,
@@ -1095,6 +1289,15 @@ async function writeGeneratedDotnet(outDir, ir, namespaceName, schemaFolderName,
     await writeFile(path.join(outDir, "Core", "Validation.cs"), await renderTemplate("dotnet/Core/Validation.cs.ejs", {
         namespaceName,
     }), "utf8");
+    await writeFile(path.join(outDir, "Core", "ItemId.cs"), await renderTemplate("dotnet/Core/ItemId.cs.ejs", {
+        namespaceName,
+    }), "utf8");
+    if (usesPrincipal && ir.connection.graphApiVersion === "beta") {
+        await writeFile(path.join(outDir, "Core", "Principal.cs"), await renderTemplate("dotnet/Core/Principal.cs.ejs", {
+            namespaceName,
+            graphApiVersion: ir.connection.graphApiVersion,
+        }), "utf8");
+    }
 }
 function formatValidationErrors(ir) {
     const issues = validateIr(ir);