Enforce exact optional source boundaries

package.json

@@ -50,10 +50,11 @@
     "test:coverage": "jest --coverage --passWithNoTests",
     "test:declarations": "ts-node --project tsconfig.tests.json scripts/check-declarations.ts && tsc -p tsconfig.declaration-tests.json --noEmit && npm run -s test:exact-public-config",
     "test:exact-public-config": "tsc -p tsconfig.exact-public-config-tests.json --noEmit",
+    "test:exact-source": "tsc -p tsconfig.exact-source.json --noEmit",
     "test:integration": "npm run -s typecheck && jest -c jest.integration.config.js --passWithNoTests",
     "test:integration:ci": "npm run -s typecheck && jest -c jest.integration.config.js --runInBand",
     "test:watch": "jest --watch",
-    "typecheck": "tsc -p tsconfig.tests.json --noEmit"
+    "typecheck": "tsc -p tsconfig.tests.json --noEmit && npm run -s test:exact-source"
   },
   "config": {
     "localnet_quickstart_ref": "5c90cf4d0eb934712fd8c269b56e6272b605ccad"

src/functions/OpenCapTable/capTable/CapTableBatch.ts

@@ -386,9 +386,8 @@ export class CapTableBatch {
     try {
       const templateId = 'ExerciseCommand' in command ? command.ExerciseCommand.templateId : undefined;
       const mergedContext = mergeCommandContext(this.params.defaultContext, this.params.context);
-      const context = mergeCommandContext(mergedContext, {
-        commandId: this.params.commandId ?? mergedContext?.commandId ?? createUpdateCapTableCommandId(),
-      });
+      const commandId = this.params.commandId ?? mergedContext?.commandId ?? createUpdateCapTableCommandId();
+      const context = { ...mergedContext, commandId };
       response = await submitObservedTransactionTree(
         this.client,
         {
@@ -401,11 +400,11 @@ export class CapTableBatch {
           ...(this.params.logger === undefined ? {} : { logger: this.params.logger }),
           ...(this.params.metrics === undefined ? {} : { metrics: this.params.metrics }),
           ...(this.params.defaultContext === undefined ? {} : { defaultContext: this.params.defaultContext }),
-          ...(context === undefined ? {} : { context }),
+          context,
         },
         {
           operation: 'capTable.update',
-          templateId,
+          ...(templateId !== undefined ? { templateId } : {}),
           choice: 'UpdateCapTable',
         }
       );

src/functions/OpenCapTable/capTable/archiveCapTable.ts

@@ -77,7 +77,9 @@ function snapshotArchiveCapTableParams(
 function buildArchiveCapTableCommandFromSnapshot(params: ArchiveCapTableParams): CommandWithDisclosedContracts {
   return buildCapTableCommand({
     capTableContractId: params.capTableContractId,
-    capTableContractDetails: params.capTableContractDetails,
+    ...(params.capTableContractDetails === undefined
+      ? {}
+      : { capTableContractDetails: params.capTableContractDetails }),
     choice: 'ArchiveCapTable',
     choiceArgument: {},
   });
@@ -137,7 +139,11 @@ export async function archiveCapTable(
       disclosedContracts,
     },
     observability,
-    { operation: 'archiveCapTable', templateId, choice: 'ArchiveCapTable' }
+    {
+      operation: 'archiveCapTable',
+      ...(templateId === undefined ? {} : { templateId }),
+      choice: 'ArchiveCapTable',
+    }
   );
 
   return { updateId: result.transactionTree.updateId };

src/functions/OpenCapTable/capTable/getCapTableState.ts

@@ -281,7 +281,7 @@ async function buildCapTableStateFromCreatedEvent(
     try {
       const eventsResponse = await client.getEventsByContractId({
         contractId: issuerContractId,
-        ...ledgerReadScope({ readAs: issuerPartyId ? [issuerPartyId] : undefined }),
+        ...ledgerReadScope(issuerPartyId ? { readAs: [issuerPartyId] } : {}),
       });
       const issuerId = requireIssuerCanonicalObjectId(eventsResponse, issuerContractId);
       entities.set('issuer', new Set([issuerId]));

src/functions/OpenCapTable/issuer/getIssuerAsOcf.ts

@@ -19,14 +19,16 @@ import { canonicalizeNumeric10 } from '../../../utils/numeric10';
 import { damlAddressToNative, damlTimeToDateString, isRecord } from '../../../utils/typeConversions';
 import { readSingleContract } from '../shared/singleContractRead';
 
-function damlEmailToNative(damlEmail: Fairmint.OpenCapTable.Types.Contact.OcfEmail): OcfIssuerInput['email'] {
+function damlEmailToNative(
+  damlEmail: Fairmint.OpenCapTable.Types.Contact.OcfEmail
+): NonNullable<OcfIssuerInput['email']> {
   return {
     email_type: damlEmailTypeToNative(damlEmail.email_type),
     email_address: damlEmail.email_address,
   };
 }
 
-function damlPhoneToNative(phone: Fairmint.OpenCapTable.Types.Contact.OcfPhone): OcfIssuerInput['phone'] {
+function damlPhoneToNative(phone: Fairmint.OpenCapTable.Types.Contact.OcfPhone): NonNullable<OcfIssuerInput['phone']> {
   return {
     phone_type: damlPhoneTypeToNative(phone.phone_type),
     phone_number: phone.phone_number,

src/functions/OpenCapTable/shared/singleContractRead.ts

@@ -202,32 +202,31 @@ export async function readSingleContract(
   const templateIdentity = options.expectedTemplateId
     ? assertTemplateIdentity(
         {
-          templateId,
-          packageName,
+          ...(templateId !== undefined ? { templateId } : {}),
+          ...(packageName !== undefined ? { packageName } : {}),
         },
         options.expectedTemplateId,
         {
           contractId: params.contractId,
           operation: options.operation,
-          message:
-            templateId === undefined && packageName === undefined
-              ? 'Contract template identity is missing; cannot validate expected template'
-              : undefined,
+          ...(templateId === undefined && packageName === undefined
+            ? { message: 'Contract template identity is missing; cannot validate expected template' }
+            : {}),
         }
       )
     : undefined;
 
   const createArgument = requireCreateArgumentRecord(createdEvent.createArgument, params.contractId, {
     operation: options.operation,
-    templateId,
+    ...(templateId !== undefined ? { templateId } : {}),
   });
 
   return {
     contractId: params.contractId,
     createArgument,
     createdEvent,
-    templateId,
-    packageName,
-    templateIdentity,
+    ...(templateId !== undefined ? { templateId } : {}),
+    ...(packageName !== undefined ? { packageName } : {}),
+    ...(templateIdentity !== undefined ? { templateIdentity } : {}),
   };
 }

src/functions/OpenCapTable/stockIssuance/getStockIssuanceAsOcf.ts

@@ -84,18 +84,21 @@ function damlShareNumberRangeToNative(value: unknown, index: number): ShareNumbe
   };
 }
 
-function damlStockIssuanceTypeToNative(t: string | null): StockIssuanceType | undefined {
-  if (t === null) return undefined;
+function damlStockIssuanceTypeToNative(t: unknown): StockIssuanceType | undefined {
+  if (t === null || t === undefined) return undefined;
   switch (t) {
     case 'OcfStockIssuanceRSA':
       return 'RSA';
     case 'OcfStockIssuanceFounders':
       return 'FOUNDERS_STOCK';
-    default:
-      throw new OcpParseError(`Unknown DAML stock issuance type: ${t}`, {
+    default: {
+      const detail = typeof t === 'string' ? `: ${t}` : '';
+      throw new OcpParseError(`Unknown DAML stock issuance type${detail}`, {
         source: 'stockIssuance.issuance_type',
         code: OcpErrorCodes.UNKNOWN_ENUM_VALUE,
+        context: { receivedValue: t },
       });
+    }
   }
 }
 
@@ -171,6 +174,7 @@ export function damlStockIssuanceDataToNative(
         };
       })
     : [];
+  const issuanceType = damlStockIssuanceTypeToNative(anyD.issuance_type);
 
   const boardApprovalDate = optionalDamlTimeToDateString(d.board_approval_date, 'stockIssuance.board_approval_date');
   const stockholderApprovalDate = optionalDamlTimeToDateString(
@@ -208,11 +212,7 @@ export function damlStockIssuanceDataToNative(
     stock_legend_ids: Array.isArray((d as unknown as { stock_legend_ids?: unknown }).stock_legend_ids)
       ? (d as unknown as { stock_legend_ids: string[] }).stock_legend_ids
       : [],
-    ...((anyD as { issuance_type?: unknown }).issuance_type != null && {
-      issuance_type: damlStockIssuanceTypeToNative(
-        (anyD as { issuance_type?: unknown }).issuance_type as string | null
-      ),
-    }),
+    ...(issuanceType !== undefined ? { issuance_type: issuanceType } : {}),
     comments:
       (anyD as { comments?: unknown }).comments !== undefined &&
       Array.isArray((anyD as { comments?: unknown }).comments)

src/functions/OpenCapTable/stockPlan/getStockPlanAsOcf.ts

@@ -18,8 +18,8 @@ import { readSingleContract } from '../shared/singleContractRead';
 
 type StockPlanOcfData = Fairmint.OpenCapTable.OCF.StockPlan.StockPlanOcfData;
 
-function damlCancellationBehaviorToNative(b: string | null): StockPlanCancellationBehavior | undefined {
-  if (b === null) return undefined;
+function damlCancellationBehaviorToNative(b: string | null | undefined): StockPlanCancellationBehavior | undefined {
+  if (b === null || b === undefined) return undefined;
   switch (b) {
     case 'OcfPlanCancelRetire':
       return 'RETIRE';
@@ -120,6 +120,7 @@ export function damlStockPlanDataToNative(d: Fairmint.OpenCapTable.OCF.StockPlan
       receivedValue: stockClassIds,
     });
   }
+  const defaultCancellationBehavior = damlCancellationBehaviorToNative(decoded.default_cancellation_behavior);
 
   const numeric = canonicalizeNumeric10(initialSharesReserved, { allowExponent: true });
   if (!numeric.ok) {
@@ -143,9 +144,9 @@ export function damlStockPlanDataToNative(d: Fairmint.OpenCapTable.OCF.StockPlan
     ...(boardApprovalDate !== undefined ? { board_approval_date: boardApprovalDate } : {}),
     ...(stockholderApprovalDate !== undefined ? { stockholder_approval_date: stockholderApprovalDate } : {}),
     initial_shares_reserved: numeric.value,
-    ...(decoded.default_cancellation_behavior && {
-      default_cancellation_behavior: damlCancellationBehaviorToNative(decoded.default_cancellation_behavior),
-    }),
+    ...(defaultCancellationBehavior !== undefined
+      ? { default_cancellation_behavior: defaultCancellationBehavior }
+      : {}),
     stock_class_ids: [firstStockClassId, ...remainingStockClassIds],
     comments: decoded.comments,
   };

src/functions/OpenCapTable/vestingTerms/getVestingTermsAsOcf.ts

@@ -201,7 +201,11 @@ function parseVestingPeriodCommonFields(
       ? damlVestingPeriodIntegerToNative(v.cliff_installment, `${fieldPath}.cliff_installment`, 0)
       : undefined;
 
-  return { length, occurrences, cliffInstallment };
+  return {
+    length,
+    occurrences,
+    ...(cliffInstallment !== undefined ? { cliffInstallment } : {}),
+  };
 }
 
 function requireVestingPeriodValue(value: unknown, fieldPath: string): Record<string, unknown> {