fix(framework): guard type predicates against non-object and primitive values

packages/1-framework/1-core/framework-components/src/shared/authoring-type-choice.ts

@@ -231,7 +231,12 @@ function memberNamed(
 function subNamespace(
   member: AuthoringTypeNamespaceMember | undefined,
 ): AuthoringTypeNamespace | undefined {
-  return member === undefined || isAuthoringTypeDescriptor(member) ? undefined : member;
+  return member === undefined ||
+    typeof member !== 'object' ||
+    member === null ||
+    isAuthoringTypeDescriptor(member)
+    ? undefined
+    : member;
 }
 
 /** The sub-namespace at `path` of a type namespace, or `undefined` when a segment names no sub-namespace. */

packages/1-framework/1-core/framework-components/src/shared/framework-authoring.ts

@@ -608,26 +608,36 @@ function isAuthoringTemplateRecord(value: unknown): value is Record<string, unkn
 }
 
 export function isAuthoringTypeConstructorDescriptor(
-  value: object,
+  value: unknown,
 ): value is AuthoringTypeConstructorDescriptor {
-  return 'kind' in value && value.kind === 'typeConstructor';
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    'kind' in value &&
+    value.kind === 'typeConstructor'
+  );
 }
 
 export function isAuthoringTypeAliasDescriptor(
-  value: AuthoringTypeNamespaceMember,
+  value: unknown,
 ): value is AuthoringTypeAliasDescriptor {
-  return 'kind' in value && value.kind === 'typeAlias';
+  return typeof value === 'object' && value !== null && 'kind' in value && value.kind === 'typeAlias';
 }
 
 export function isAuthoringTypeChoiceDescriptor(
-  value: AuthoringTypeNamespaceMember,
+  value: unknown,
 ): value is AuthoringTypeChoiceDescriptor {
-  return 'kind' in value && value.kind === 'typeChoice';
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    'kind' in value &&
+    value.kind === 'typeChoice'
+  );
 }
 
 /** Whether `value` is a leaf of a `type` namespace: a type constructor, a type alias or a type choice. */
 export function isAuthoringTypeDescriptor(
-  value: AuthoringTypeNamespaceMember,
+  value: unknown,
 ): value is
   | AuthoringTypeConstructorDescriptor
   | AuthoringTypeAliasDescriptor
@@ -657,21 +667,26 @@ export function getAuthoringTypeConstructor(
 }
 
 export function isAuthoringEntityTypeDescriptor(
-  value: AuthoringEntityTypeDescriptor | AuthoringEntityTypeNamespace,
+  value: unknown,
 ): value is AuthoringEntityTypeDescriptor {
-  return 'kind' in value && value.kind === 'entity';
+  return typeof value === 'object' && value !== null && 'kind' in value && value.kind === 'entity';
 }
 
 export function isAuthoringPslBlockDescriptor(
-  value: AuthoringPslBlockDescriptor | AuthoringPslBlockDescriptorNamespace,
+  value: unknown,
 ): value is AuthoringPslBlockDescriptor {
-  return 'kind' in value && value.kind === 'pslBlock';
+  return typeof value === 'object' && value !== null && 'kind' in value && value.kind === 'pslBlock';
 }
 
 export function isAuthoringModelAttributeDescriptor(
-  value: AuthoringModelAttributeDescriptor | AuthoringModelAttributeDescriptorNamespace,
+  value: unknown,
 ): value is AuthoringModelAttributeDescriptor {
-  return 'kind' in value && value.kind === 'modelAttribute';
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    'kind' in value &&
+    value.kind === 'modelAttribute'
+  );
 }
 
 function isCopyableNamespaceObject(value: unknown): value is Record<string, unknown> {

packages/1-framework/1-core/framework-components/test/framework-components.authoring.test.ts

@@ -9,7 +9,13 @@ import {
   classifyEnumMemberType,
   instantiateAuthoringTypeConstructor,
   isAuthoringArgRef,
+  isAuthoringEntityTypeDescriptor,
+  isAuthoringModelAttributeDescriptor,
+  isAuthoringPslBlockDescriptor,
+  isAuthoringTypeAliasDescriptor,
+  isAuthoringTypeChoiceDescriptor,
   isAuthoringTypeConstructorDescriptor,
+  isAuthoringTypeDescriptor,
   resolveAuthoringTemplateValue,
   validateAuthoringHelperArguments,
 } from '../src/shared/framework-authoring';
@@ -29,6 +35,32 @@ describe('authoring template resolution', () => {
     expect(isAuthoringTypeConstructorDescriptor(typeNamespace)).toBe(false);
   });
 
+  it('safely rejects non-object and primitive values without throwing TypeError', () => {
+    const nonObjects = [
+      'typeChoice',
+      'typeConstructor',
+      'typeAlias',
+      '',
+      123,
+      0,
+      true,
+      false,
+      Symbol('kind'),
+      null,
+      undefined,
+    ];
+
+    for (const val of nonObjects) {
+      expect(isAuthoringTypeConstructorDescriptor(val)).toBe(false);
+      expect(isAuthoringTypeAliasDescriptor(val)).toBe(false);
+      expect(isAuthoringTypeChoiceDescriptor(val)).toBe(false);
+      expect(isAuthoringTypeDescriptor(val)).toBe(false);
+      expect(isAuthoringEntityTypeDescriptor(val)).toBe(false);
+      expect(isAuthoringPslBlockDescriptor(val)).toBe(false);
+      expect(isAuthoringModelAttributeDescriptor(val)).toBe(false);
+    }
+  });
+
   it('rejects arg refs with an invalid index', () => {
     expect(isAuthoringArgRef({ kind: 'arg', index: 0 })).toBe(true);
 

packages/1-framework/2-authoring/psl-parser/src/contributed-type-scope.ts

@@ -67,9 +67,11 @@ export interface ContributedTypeScope {
 }
 
 export function isContributedTypeDescriptor(
-  value: ContributedTypeDescriptor | ContributedTypeNamespace,
+  value: unknown,
 ): value is ContributedTypeDescriptor {
   return (
+    typeof value === 'object' &&
+    value !== null &&
     'kind' in value &&
     (value.kind === 'typeConstructor' || value.kind === 'typeAlias' || value.kind === 'typeChoice')
   );

packages/2-sql-family/2-authoring/contract-ts/src/removed-field-presets.ts

@@ -175,11 +175,14 @@ function codecIdAt(
   path: readonly string[],
   options: Readonly<Record<string, string>> | undefined,
 ): string | undefined {
+  if (typeof types !== 'object' || types === null) return undefined;
   const [name, ...rest] = path;
   if (name === undefined || !Object.hasOwn(types, name)) return undefined;
   const value = types[name];
   if (value === undefined) return undefined;
-  if (!isAuthoringTypeDescriptor(value)) return codecIdAt(value, rest, options);
+  if (!isAuthoringTypeDescriptor(value)) {
+    return typeof value === 'object' && value !== null ? codecIdAt(value, rest, options) : undefined;
+  }
   if (rest.length > 0) return undefined;
   if (isAuthoringTypeChoiceDescriptor(value)) {
     const args = value.args.map((argument) =>

packages/2-sql-family/2-authoring/contract-ts/test/removed-field-presets.test.ts

@@ -248,4 +248,16 @@ describe('a read of a removed field preset from the SQL field helpers', () => {
       Object.keys(postgresField),
     ]).toEqual([{ codecId: 'pg/text@1' }, ['column', 'namedType']]);
   });
+
+  it('safely tolerates namespaces containing non-object and primitive members', () => {
+    const typesWithPrimitives = {
+      ...postgresLike,
+      invalidPrimitive: 'typeChoice',
+      invalidNull: null,
+      invalidUndefined: undefined,
+    } as unknown as Parameters<typeof refusingRemovedFieldPresets>[1];
+
+    const testField = refusingRemovedFieldPresets(field, typesWithPrimitives);
+    expect(refusalOf(testField, 'id.uuidv4String')).toBeDefined();
+  });
 });