@astryxdesign/native 0.7.4-canary.720bb10 → 0.7.5-canary.04434e7

package/dist/contract/generateSwift.js

@@ -2,9 +2,13 @@
 /**
  * @file contract/generateSwift.ts
  * @input Component contracts
- * @output Swift sources for the Apple platforms: shared base props and one file
- *   per component, with the iOS and macOS contracts behind `#if os(...)`
- * @position Produces the Swift binding (AST-082 FR5). Generated files are
+ * @output Swift sources for the Apple platforms: shared base props, the wire
+ *   (AstryxNode, AstryxAction), and one file per component with the iOS and
+ *   macOS contracts behind `#if os(...)`
+ * @position Produces the Swift binding (AST-082 FR5). Each component gets
+ *   `<Name>Props`, the contract a SwiftUI view takes, and `<Name>Node`, the
+ *   same contract as JSON a TypeScript core sends (arm C), which turns into
+ *   props whose callbacks send `AstryxAction`s back. Generated files are
  *   committed under apple/ so a Swift package can pin a commit
  */
 import { SWIFT_KEYWORDS } from './names.js';
@@ -13,9 +17,14 @@ const APPLE_PLATFORMS = [
     { platform: 'ios', condition: 'os(iOS)' },
     { platform: 'macos', condition: 'os(macOS)' },
 ];
+const RECORD_CONFORMANCES = 'Equatable, Codable, Sendable';
 const camel = (text) => text.replace(/[-_ ]+([a-zA-Z0-9])/g, (_, ch) => ch.toUpperCase());
 const pascal = (text) => camel(text).replace(/^./, ch => ch.toUpperCase());
 const ident = (name) => SWIFT_KEYWORDS.has(name) ? `\`${name}\`` : name;
+/** `1` → `v1`, `0.5` → `v0_5`, `-1` → `vMinus1`. */
+function numberCaseName(value) {
+    return `v${String(value).replace('-', 'Minus').replace('.', '_')}`;
+}
 function caseName(value) {
     const name = camel(value.replace(/[^A-Za-z0-9_-]/g, '-'));
     return ident(/^[0-9]/.test(name) ? `v${name}` : name || 'empty');
@@ -34,18 +43,27 @@ class SwiftWriter {
             case 'enum': {
                 const name = `${owner}${pascal(prop)}`;
                 const cases = type.values.map(value => `  case ${caseName(value)} = "${value}"`);
-                this.decls.push(`public enum ${name}: String, CaseIterable, Sendable {\n${cases.join('\n')}\n}`);
+                this.decls.push(`public enum ${name}: String, CaseIterable, Codable, Sendable {\n${cases.join('\n')}\n}`);
+                return name;
+            }
+            case 'numberEnum': {
+                const name = `${owner}${pascal(prop)}`;
+                const raw = type.values.every(Number.isInteger) ? 'Int' : 'Double';
+                const cases = type.values.map(value => `  case ${numberCaseName(value)} = ${value}`);
+                this.decls.push(`public enum ${name}: ${raw}, CaseIterable, Codable, Sendable {\n${cases.join('\n')}\n}`);
                 return name;
             }
             case 'array':
                 return `[${this.type(owner, prop, type.of)}]`;
             case 'record': {
                 const name = `${owner}${pascal(prop)}`;
-                this.decls.push(this.struct(name, type.fields, 'Equatable, Sendable'));
+                this.decls.push(this.struct(name, type.fields, RECORD_CONFORMANCES));
                 return name;
             }
             case 'fn':
                 return `(${type.args.map((arg, i) => this.type(owner, `${prop}Arg${i}`, arg)).join(', ')}) -> Void`;
+            case 'content':
+                return '[AstryxNode]';
             case 'named':
                 return type.name;
         }
@@ -79,15 +97,65 @@ class SwiftWriter {
         ].join('\n');
     }
 }
+/** Props without content slots: a SwiftUI view takes content as a builder. */
+function withoutContent(props) {
+    return Object.fromEntries(Object.entries(props).filter(([, spec]) => spec.type.kind !== 'content'));
+}
+function withoutCallbacks(props) {
+    return Object.fromEntries(Object.entries(props).filter(([, spec]) => spec.type.kind !== 'fn'));
+}
+/** `<Name>Node`: the component as JSON from a TypeScript core (arm C). */
+function nodeStruct(writer, contract, props) {
+    const name = contract.name;
+    const data = writer.fields(name, withoutCallbacks(props));
+    const callbacks = Object.entries(props).filter(([, spec]) => spec.type.kind === 'fn');
+    // Each callback the core listens to (`events`) sends an action with the
+    // callback's arguments; one it does not listen to stays nil.
+    const binding = Object.entries(withoutContent(props)).map(([prop, spec]) => {
+        if (spec.type.kind !== 'fn') {
+            return `      ${prop}: props.${ident(prop)}`;
+        }
+        const params = spec.type.args.map((_, i) => `arg${i}`);
+        const values = params.map(param => `AstryxValue(${param})`).join(', ');
+        const closure = `{ ${params.length > 0 ? `${params.join(', ')} in ` : ''}send(AstryxAction(key: key, component: "${name}", event: "${prop}", args: [${values}])) }`;
+        return spec.optional
+            ? `      ${prop}: listens("${prop}") ? ${closure} : nil`
+            : `      ${prop}: ${closure}`;
+    });
+    return [
+        `public struct ${name}Node: Decodable, Equatable, Sendable {`,
+        `  public struct Props: Decodable, Equatable, Sendable {`,
+        ...data.map(field => `  ${field.decl}`),
+        '  }',
+        '  public let key: String',
+        '  public let base: AstryxBaseProps?',
+        '  public let props: Props',
+        `  /// The callbacks the core listens to, by prop name.`,
+        '  public let events: [String]?',
+        '',
+        `  public func listens(_ event: String) -> Bool { events?.contains(event) ?? false }`,
+        '',
+        `  /// The contract a ${name} view takes; its callbacks send actions to the core.`,
+        `  public func viewProps(send: @escaping @Sendable (AstryxAction) -> Void) -> ${name}Props {`,
+        ...(callbacks.length > 0 ? ['    let key = self.key'] : []),
+        `    return ${name}Props(`,
+        [...binding, '      base: base ?? AstryxBaseProps()'].join(',\n'),
+        '    )',
+        '  }',
+        '}',
+    ].join('\n');
+}
 function componentFile(contract) {
     const shared = new SwiftWriter();
-    const typeDecls = Object.entries(contract.types).map(([name, fields]) => shared.struct(name, fields, 'Equatable, Sendable'));
+    const typeDecls = Object.entries(contract.types).map(([name, fields]) => shared.struct(name, fields, RECORD_CONFORMANCES));
     // Core enums and records are declared once, outside the platform blocks.
     shared.fields(`${contract.name}`, contract.core);
     const variants = APPLE_PLATFORMS.map(({ platform, condition }) => {
         const writer = new SwiftWriter();
         const extra = contract.platforms[platform] ?? {};
-        const fields = writer.fields(contract.name, { ...contract.core, ...extra });
+        const all = { ...contract.core, ...extra };
+        const fields = writer.fields(contract.name, withoutContent(all));
+        const node = nodeStruct(writer, contract, all);
         // Core-prop declarations already live outside the platform blocks; keep
         // only the declarations this platform's own props need.
         writer.decls.length = 0;
@@ -104,16 +172,127 @@ function componentFile(contract) {
             '  }',
             '}',
         ].join('\n');
-        return `#if ${condition}\n${[...writer.decls, struct].join('\n')}\n#endif`;
+        return `#if ${condition}\n${[...writer.decls, struct, node].join('\n')}\n#endif`;
     });
     return (HEADER + [...typeDecls, ...shared.decls, ...variants].join('\n') + '\n');
 }
+/** `AstryxNode`: one case per component, decoded by its `component` name. */
+function nodeFile(contracts) {
+    const caseOf = (name) => camel(name.replace(/^./, ch => ch.toLowerCase()));
+    return (HEADER +
+        [
+            'import Foundation',
+            '',
+            '#if os(iOS) || os(macOS)',
+            '/// One Astryx component in a tree a TypeScript core sends, by its `component` name.',
+            '/// A node this binding cannot read decodes as `unsupported`: an unknown component,',
+            '/// or a known one with a value its enums lack or a required prop missing. An older',
+            "/// app then keeps drawing the rest of a newer core's tree.",
+            'public enum AstryxNode: Decodable, Equatable, Sendable {',
+            ...contracts.map(c => `  case ${ident(caseOf(c.name))}(${c.name}Node)`),
+            '  case unsupported(component: String, key: String)',
+            '',
+            '  public var key: String {',
+            '    switch self {',
+            ...contracts.map(c => `    case .${ident(caseOf(c.name))}(let node): return node.key`),
+            '    case .unsupported(_, let key): return key',
+            '    }',
+            '  }',
+            '',
+            '  private enum Keys: String, CodingKey { case component, key }',
+            '',
+            '  public init(from decoder: any Decoder) throws {',
+            '    let container = try decoder.container(keyedBy: Keys.self)',
+            '    let component = try container.decode(String.self, forKey: .component)',
+            '    let key = try container.decode(String.self, forKey: .key)',
+            '    do {',
+            '      switch component {',
+            ...contracts.map(c => `      case "${c.name}": self = .${ident(caseOf(c.name))}(try ${c.name}Node(from: decoder))`),
+            '      default: self = .unsupported(component: component, key: key)',
+            '      }',
+            '    } catch {',
+            '      self = .unsupported(component: component, key: key)',
+            '    }',
+            '  }',
+            '}',
+            '#endif',
+        ].join('\n') +
+        '\n');
+}
+const WIRE_FILE = HEADER +
+    `import Foundation
+
+/// A JSON value: a portable callback argument on its way to the core.
+public enum AstryxValue: Codable, Equatable, Sendable {
+  case null
+  case bool(Bool)
+  case number(Double)
+  case string(String)
+  case array([AstryxValue])
+  case object([String: AstryxValue])
+
+  /// Any portable value (a contract's strings, numbers, enums, and records) as JSON.
+  public init<T: Encodable>(_ value: T) {
+    guard let data = try? JSONEncoder().encode(value),
+          let decoded = try? JSONDecoder().decode(AstryxValue.self, from: data) else {
+      self = .null
+      return
+    }
+    self = decoded
+  }
+
+  public init(from decoder: any Decoder) throws {
+    let container = try decoder.singleValueContainer()
+    if container.decodeNil() { self = .null }
+    else if let value = try? container.decode(Bool.self) { self = .bool(value) }
+    else if let value = try? container.decode(Double.self) { self = .number(value) }
+    else if let value = try? container.decode(String.self) { self = .string(value) }
+    else if let value = try? container.decode([AstryxValue].self) { self = .array(value) }
+    else { self = .object(try container.decode([String: AstryxValue].self)) }
+  }
+
+  public func encode(to encoder: any Encoder) throws {
+    var container = encoder.singleValueContainer()
+    switch self {
+    case .null: try container.encodeNil()
+    case .bool(let value): try container.encode(value)
+    case .number(let value): try container.encode(value)
+    case .string(let value): try container.encode(value)
+    case .array(let value): try container.encode(value)
+    case .object(let value): try container.encode(value)
+    }
+  }
+}
+
+/// A callback a view called: which node, which prop, and its arguments.
+public struct AstryxAction: Codable, Equatable, Sendable {
+  public let key: String
+  public let component: String
+  public let event: String
+  public let args: [AstryxValue]
+
+  public init(key: String, component: String, event: String, args: [AstryxValue]) {
+    self.key = key
+    self.component = component
+    self.event = event
+    self.args = args
+  }
+
+  /// The JSON the core receives.
+  public var json: String {
+    let encoder = JSONEncoder()
+    encoder.outputFormatting = [.sortedKeys, .withoutEscapingSlashes]
+    guard let data = try? encoder.encode(self) else { return "{}" }
+    return String(decoding: data, as: UTF8.self)
+  }
+}
+`;
 const BASE_FILE = HEADER +
     [
         'public enum AstryxBaseTarget: String, Sendable { case root, trigger, control, container }',
         '',
         '/// Base props shared by every platform (AST-082 FR7).',
-        'public struct AstryxBaseProps: Equatable, Sendable {',
+        'public struct AstryxBaseProps: Equatable, Codable, Sendable {',
         '  public var id: String?',
         '  public var isHidden: Bool?',
         '  public init(id: String? = nil, isHidden: Bool? = nil) {',
@@ -125,7 +304,11 @@ const BASE_FILE = HEADER +
     '\n';
 /** Returns file name to contents, relative to the generated Swift folder. */
 export function generateSwift(contracts) {
-    const files = { 'AstryxBase.swift': BASE_FILE };
+    const files = {
+        'AstryxBase.swift': BASE_FILE,
+        'AstryxNode.swift': nodeFile(contracts),
+        'AstryxWire.swift': WIRE_FILE,
+    };
     for (const contract of contracts) {
         files[`${contract.name}.swift`] = componentFile(contract);
     }

package/dist/contract/generateTypeScript.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateTypeScript.d.ts","sourceRoot":"","sources":["../../src/contract/generateTypeScript.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAC,iBAAiB,EAAoB,MAAM,YAAY,CAAC;AA2FrE,0EAA0E;AAC1E,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,SAAS,iBAAiB,EAAE,GACtC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CASxB"}
+{"version":3,"file":"generateTypeScript.d.ts","sourceRoot":"","sources":["../../src/contract/generateTypeScript.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAC,iBAAiB,EAA8B,MAAM,YAAY,CAAC;AAoK/E,0EAA0E;AAC1E,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,SAAS,iBAAiB,EAAE,GACtC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CASxB"}

package/dist/contract/generateTypeScript.js

@@ -8,7 +8,11 @@
  */
 import { NATIVE_PLATFORMS } from '../platforms.js';
 const HEADER = '// Generated by @astryxdesign/native. Do not edit.\n';
-function tsType(type) {
+/**
+ * `content` names the type of one child component: the open
+ * `AstryxContentNode` in core contracts, a platform's `AstryxNode` in its wire.
+ */
+function tsType(type, content = 'AstryxContentNode') {
     switch (type.kind) {
         case 'string':
         case 'number':
@@ -16,14 +20,18 @@ function tsType(type) {
             return type.kind;
         case 'enum':
             return type.values.map(value => `'${value}'`).join(' | ');
+        case 'numberEnum':
+            return type.values.join(' | ');
         case 'array': {
-            const inner = tsType(type.of);
+            const inner = tsType(type.of, content);
             return `ReadonlyArray<${inner}>`;
         }
         case 'record':
-            return `{${members(type.fields, ' ')}}`;
+            return `{${members(type.fields, ' ', content)}}`;
         case 'fn':
-            return `(${type.args.map((arg, i) => `arg${i}: ${tsType(arg)}`).join(', ')}) => void`;
+            return `(${type.args.map((arg, i) => `arg${i}: ${tsType(arg, content)}`).join(', ')}) => void`;
+        case 'content':
+            return `ReadonlyArray<${content}>`;
         case 'named':
             return type.name;
     }
@@ -31,9 +39,9 @@ function tsType(type) {
 function key(name) {
     return /^[A-Za-z_$][\w$]*$/.test(name) ? name : `'${name}'`;
 }
-function members(props, separator = '\n  ') {
+function members(props, separator = '\n  ', content = 'AstryxContentNode') {
     return Object.entries(props)
-        .map(([name, spec]) => `${key(name)}${spec.optional ? '?' : ''}: ${tsType(spec.type)};`)
+        .map(([name, spec]) => `${key(name)}${spec.optional ? '?' : ''}: ${tsType(spec.type, content)};`)
         .join(separator);
 }
 function coreFile(contracts) {
@@ -49,19 +57,65 @@ function coreFile(contracts) {
     return (HEADER +
         '/** Base props shared by every platform (AST-082 FR7). */\n' +
         'export interface AstryxSharedBaseProps {\n  id?: string;\n  isHidden?: boolean;\n}\n' +
+        '/** One child Astryx component in a content slot (AST-082 FR4). */\n' +
+        'export interface AstryxContentNode {\n  readonly component: string;\n  readonly key: string;\n}\n' +
         [...typeDecls, ...props].join('\n') +
         '\n');
 }
 function reExports(contracts) {
-    const names = new Set(['AstryxSharedBaseProps']);
+    const names = new Set(['AstryxSharedBaseProps', 'AstryxContentNode']);
     for (const contract of contracts) {
         Object.keys(contract.types).forEach(name => names.add(name));
         names.add(`${contract.name}CoreProps`);
     }
     return `export type {${[...names].join(', ')}} from './core.js';\n`;
 }
+/**
+ * The wire a TypeScript core sends a native host (arm C): each component as
+ * JSON with its data props, the callbacks it listens to, and the actions a
+ * host sends back when a view calls one.
+ */
+function wire(contracts, platform) {
+    const nodes = [];
+    const actions = [];
+    for (const contract of contracts) {
+        const props = {
+            ...contract.core,
+            ...(platform ? (contract.platforms[platform] ?? {}) : {}),
+        };
+        const data = {};
+        const events = [];
+        for (const [name, spec] of Object.entries(props)) {
+            if (spec.type.kind === 'fn') {
+                events.push(name);
+                actions.push(`  | {key: string; component: '${contract.name}'; event: '${name}'; args: [${spec.type.args.map(arg => tsType(arg, 'AstryxNode')).join(', ')}]}`);
+            }
+            else {
+                data[name] = spec;
+            }
+        }
+        nodes.push(`/** ${contract.name} as JSON from a TypeScript core. */\n` +
+            `export interface ${contract.name}Node {\n` +
+            `  component: '${contract.name}';\n` +
+            '  key: string;\n' +
+            '  base?: AstryxSharedBaseProps;\n' +
+            `  props: {${members(data, ' ', 'AstryxNode')}};\n` +
+            (events.length > 0
+                ? `  /** The callbacks the core listens to. */\n  events?: ReadonlyArray<${events.map(e => `'${e}'`).join(' | ')}>;\n`
+                : '') +
+            '}');
+    }
+    return [
+        ...nodes,
+        '/** Any Astryx component a TypeScript core can send. */',
+        `export type AstryxNode = ${contracts.map(c => `${c.name}Node`).join(' | ')};`,
+        '/** A callback a native view called, sent back to the core. */',
+        `export type AstryxAction =\n${actions.join('\n') || '  never'};`,
+    ].join('\n');
+}
 function platformFile(contracts, platform) {
-    const imports = `import type {${contracts.map(c => `${c.name}CoreProps`).join(', ')}} from './core.js';\n`;
+    const named = contracts.flatMap(c => Object.keys(c.types));
+    const imports = `import type {${['AstryxSharedBaseProps', ...new Set(named), ...contracts.map(c => `${c.name}CoreProps`)].join(', ')}} from './core.js';\n`;
     const components = contracts.map(contract => {
         const extra = platform ? (contract.platforms[platform] ?? {}) : {};
         const body = Object.keys(extra).length > 0 ? `\n  ${members(extra)}\n` : '';
@@ -72,7 +126,13 @@ function platformFile(contracts, platform) {
             `export interface ${contract.name}Props extends ${contract.name}CoreProps {${body}}\n` +
             `export declare function ${contract.name}(props: ${contract.name}Props): unknown;`);
     });
-    return HEADER + imports + reExports(contracts) + components.join('\n') + '\n';
+    return (HEADER +
+        imports +
+        reExports(contracts) +
+        components.join('\n') +
+        '\n' +
+        wire(contracts, platform) +
+        '\n');
 }
 /** Returns file name to contents, relative to the types output folder. */
 export function generateTypeScript(contracts) {

package/dist/contract/index.d.ts

@@ -2,15 +2,19 @@ import { type ComponentDocLike } from './fromComponentDoc.js';
 import { type ContractIssue } from './rules.js';
 import type { ComponentContract } from './types.js';
 export { fromComponentDoc } from './fromComponentDoc.js';
-export type { ComponentDocLike, NativeAdditions } from './fromComponentDoc.js';
+export type { ComponentDocLike, NativeAdditions, SlotKind, } from './fromComponentDoc.js';
 export { generateSwift } from './generateSwift.js';
 export { generateTypeScript } from './generateTypeScript.js';
 export { parseDocType } from './parseDocType.js';
 export { checkContract, coreNameProblem } from './rules.js';
 export type { ContractIssue } from './rules.js';
 export type * from './types.js';
-/** Loads one core component's documentation by component name. */
-export type ComponentDocLoader = (name: string) => Promise<ComponentDocLike>;
+/**
+ * Loads one core documentation file: a component name for
+ * `<Name>/<Name>.doc.mjs`, or a path such as `Text/Heading` relative to core's
+ * `src` without `.doc.mjs`.
+ */
+export type ComponentDocLoader = (file: string) => Promise<ComponentDocLike>;
 export interface BuiltContracts {
     readonly contracts: readonly ComponentContract[];
     readonly warnings: readonly ContractIssue[];

package/dist/contract/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contract/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAAmB,KAAK,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAAgB,KAAK,aAAa,EAAC,MAAM,YAAY,CAAC;AAC7D,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAElD,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AACvD,YAAY,EAAC,gBAAgB,EAAE,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAC,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAC,aAAa,EAAE,eAAe,EAAC,MAAM,YAAY,CAAC;AAC1D,YAAY,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AAC9C,mBAAmB,YAAY,CAAC;AAEhC,kEAAkE;AAClE,MAAM,MAAM,kBAAkB,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAE7E,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,SAAS,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACjD,QAAQ,CAAC,QAAQ,EAAE,SAAS,aAAa,EAAE,CAAC;CAC7C;AAED,8EAA8E;AAC9E,wBAAsB,cAAc,CAClC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,cAAc,CAAC,CAiBzB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contract/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAAmB,KAAK,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAAgB,KAAK,aAAa,EAAC,MAAM,YAAY,CAAC;AAC7D,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAElD,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AACvD,YAAY,EACV,gBAAgB,EAChB,eAAe,EACf,QAAQ,GACT,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAC,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAC,aAAa,EAAE,eAAe,EAAC,MAAM,YAAY,CAAC;AAC1D,YAAY,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AAC9C,mBAAmB,YAAY,CAAC;AAEhC;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAE7E,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,SAAS,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACjD,QAAQ,CAAC,QAAQ,EAAE,SAAS,aAAa,EAAE,CAAC;CAC7C;AAED,8EAA8E;AAC9E,wBAAsB,cAAc,CAClC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,cAAc,CAAC,CAkBzB"}

package/dist/contract/index.js

@@ -20,7 +20,8 @@ export async function buildContracts(loadDoc) {
     const warnings = [];
     const errors = [];
     for (const additions of NATIVE_COMPONENTS) {
-        const contract = fromComponentDoc(await loadDoc(additions.name), additions);
+        const doc = await loadDoc(additions.doc?.file ?? additions.name);
+        const contract = fromComponentDoc(doc, additions);
         for (const issue of checkContract(contract)) {
             (issue.level === 'error' ? errors : warnings).push(issue);
         }

package/dist/contract/parseDocType.d.ts

@@ -11,11 +11,14 @@ export type ParsedType = {
 } | {
     readonly ok: false;
     readonly reason: string;
+    /** True for a callback whose only arguments are DOM events. */
+    readonly eventOnly?: boolean;
 };
 /**
  * Parses a documented type string. Supported portable forms: `string`,
- * `number`, `boolean`, closed string unions, arrays, plain object literals,
- * callbacks with portable arguments, and named types. A union of different
+ * `number`, `boolean`, closed string or number unions, arrays, plain object
+ * literals, callbacks with portable arguments (a trailing DOM event argument
+ * is the web's part), and named types. A union of different
  * kinds has no Swift or Kotlin form.
  */
 export declare function parseDocType(raw: string): ParsedType;

package/dist/contract/parseDocType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseDocType.d.ts","sourceRoot":"","sources":["../../src/contract/parseDocType.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AAEH,OAAO,KAAK,EAAW,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEnD,MAAM,MAAM,UAAU,GAClB;IAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;CAAC,GAC5C;IAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAAC;AAuIlD;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAwDpD"}
+{"version":3,"file":"parseDocType.d.ts","sourceRoot":"","sources":["../../src/contract/parseDocType.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AAEH,OAAO,KAAK,EAAW,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEnD,MAAM,MAAM,UAAU,GAClB;IAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;CAAC,GAC5C;IACE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,+DAA+D;IAC/D,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AA8JN;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CA8DpD"}

package/dist/contract/parseDocType.js

@@ -19,7 +19,15 @@ const WEB_ONLY_TYPES = {
     ChangeEvent: 'DOM event',
     DragEvent: 'DOM event',
     ClipboardEvent: 'DOM event',
+    FormEvent: 'DOM event',
+    TouchEvent: 'DOM event',
+    SyntheticEvent: 'DOM event',
 };
+/** True for a DOM event type, with or without its element parameter. */
+function isDomEvent(text) {
+    const name = /^(?:React\.)?([A-Z]\w*)(?:<[\s\S]*>)?$/.exec(text.trim())?.[1];
+    return name != null && WEB_ONLY_TYPES[name] === 'DOM event';
+}
 const ok = (type) => ({ ok: true, type });
 const no = (reason) => ({ ok: false, reason });
 /** Splits on a separator at bracket depth zero, ignoring quoted text. */
@@ -115,10 +123,24 @@ function parseFunction(text) {
             : 'callback returns a value; only void callbacks are portable today');
     }
     const params = arrow[0].slice(1, -1).trim();
-    const args = [];
-    for (const param of params ? splitTop(params, ',') : []) {
+    const types = (params ? splitTop(params, ',') : []).map(param => {
         const match = /^([A-Za-z_$][\w$]*)\??\s*:\s*([\s\S]+)$/.exec(param);
-        const parsed = parseDocType(match ? match[2] : param);
+        return match ? match[2] : param;
+    });
+    // A value callback ends with the DOM event that caused it, as in
+    // `(checked: boolean, e: ChangeEvent) => void`. The values are the portable
+    // callback; the trailing event is the web's part. A callback that carries
+    // only an event stays on the web.
+    let end = types.length;
+    while (end > 0 && isDomEvent(types[end - 1])) {
+        end--;
+    }
+    if (end === 0 && types.length > 0) {
+        return { ok: false, reason: 'callback argument: DOM event', eventOnly: true };
+    }
+    const args = [];
+    for (const type of types.slice(0, end)) {
+        const parsed = parseDocType(type);
         if (!parsed.ok) {
             return no(`callback argument: ${parsed.reason}`);
         }
@@ -128,8 +150,9 @@ function parseFunction(text) {
 }
 /**
  * Parses a documented type string. Supported portable forms: `string`,
- * `number`, `boolean`, closed string unions, arrays, plain object literals,
- * callbacks with portable arguments, and named types. A union of different
+ * `number`, `boolean`, closed string or number unions, arrays, plain object
+ * literals, callbacks with portable arguments (a trailing DOM event argument
+ * is the web's part), and named types. A union of different
  * kinds has no Swift or Kotlin form.
  */
 export function parseDocType(raw) {
@@ -146,6 +169,9 @@ export function parseDocType(raw) {
         if (members.every(m => /^'[^']*'$/.test(m))) {
             return ok({ kind: 'enum', values: members.map(m => m.slice(1, -1)) });
         }
+        if (members.every(m => /^-?\d+(?:\.\d+)?$/.test(m))) {
+            return ok({ kind: 'numberEnum', values: members.map(Number) });
+        }
         const webOnly = members.find(m => WEB_ONLY_TYPES[m] != null);
         if (webOnly) {
             return no(WEB_ONLY_TYPES[webOnly]);
@@ -162,6 +188,9 @@ export function parseDocType(raw) {
     if (WEB_ONLY_TYPES[t] != null) {
         return no(WEB_ONLY_TYPES[t]);
     }
+    if (isDomEvent(t)) {
+        return no('DOM event');
+    }
     const generic = /^(?:Readonly)?Array<([\s\S]+)>$/.exec(t);
     if (t.endsWith('[]') || generic) {
         const inner = parseDocType(generic ? generic[1] : t.slice(0, -2));

package/dist/contract/rules.d.ts

@@ -4,7 +4,10 @@ export interface ContractIssue {
     readonly rule: 'core-is-portable' | 'name-keyword' | 'name-toolkit' | 'platform-shadows-core' | 'same-name-different-meaning' | 'unknown-type';
     readonly message: string;
 }
-/** Why a core prop name is not allowed, or null when it is. */
-export declare function coreNameProblem(name: string): string | null;
+/**
+ * Why a core prop name is not allowed, or null when it is. A toolkit name is
+ * allowed when the component declares it has the same meaning there.
+ */
+export declare function coreNameProblem(name: string, sameMeaning?: boolean): string | null;
 export declare function checkContract(contract: ComponentContract): ContractIssue[];
 //# sourceMappingURL=rules.d.ts.map

package/dist/contract/rules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../src/contract/rules.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAC,iBAAiB,EAAoB,MAAM,YAAY,CAAC;AAErE,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,IAAI,EACT,kBAAkB,GAClB,cAAc,GACd,cAAc,GACd,uBAAuB,GACvB,6BAA6B,GAC7B,cAAc,CAAC;IACnB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,+DAA+D;AAC/D,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAgB3D;AAeD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,aAAa,EAAE,CAoE1E"}
+{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../src/contract/rules.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAC,iBAAiB,EAAoB,MAAM,YAAY,CAAC;AAErE,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,IAAI,EACT,kBAAkB,GAClB,cAAc,GACd,cAAc,GACd,uBAAuB,GACvB,6BAA6B,GAC7B,cAAc,CAAC;IACnB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,WAAW,UAAQ,GAClB,MAAM,GAAG,IAAI,CAgBf;AAeD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,aAAa,EAAE,CAqE1E"}

package/dist/contract/rules.js

@@ -8,15 +8,18 @@
  */
 import { NATIVE_PLATFORMS } from '../platforms.js';
 import { KOTLIN_KEYWORDS, RECLAIMED, SWIFT_KEYWORDS, TOOLKIT_NAMES, } from './names.js';
-/** Why a core prop name is not allowed, or null when it is. */
-export function coreNameProblem(name) {
+/**
+ * Why a core prop name is not allowed, or null when it is. A toolkit name is
+ * allowed when the component declares it has the same meaning there.
+ */
+export function coreNameProblem(name, sameMeaning = false) {
     if (SWIFT_KEYWORDS.has(name)) {
         return `"${name}" is a Swift keyword`;
     }
     if (KOTLIN_KEYWORDS.has(name)) {
         return `"${name}" is a Kotlin keyword`;
     }
-    if (RECLAIMED.has(name)) {
+    if (RECLAIMED.has(name) || sameMeaning) {
         return null;
     }
     for (const [toolkit, names] of Object.entries(TOOLKIT_NAMES)) {
@@ -46,8 +49,9 @@ export function checkContract(contract) {
     const add = (level, rule, message) => issues.push({ level, rule, message: `${contract.name}: ${message}` });
     const referenced = new Set();
     const collect = (props) => Object.values(props).forEach(spec => namedTypesIn(spec.type, referenced));
+    const sameMeaning = new Set(contract.sameMeaning ?? []);
     for (const name of Object.keys(contract.core)) {
-        const problem = coreNameProblem(name);
+        const problem = coreNameProblem(name, sameMeaning.has(name));
         if (problem) {
             add('error', SWIFT_KEYWORDS.has(name) || KOTLIN_KEYWORDS.has(name)
                 ? 'name-keyword'

package/dist/contract/types.d.ts

@@ -16,6 +16,11 @@ export type PropType = {
 } | {
     kind: 'enum';
     values: readonly string[];
+}
+/** A closed set of numbers, such as a heading level or a spacing step. */
+ | {
+    kind: 'numberEnum';
+    values: readonly number[];
 } | {
     kind: 'array';
     of: PropType;
@@ -25,6 +30,10 @@ export type PropType = {
 } | {
     kind: 'fn';
     args: readonly PropType[];
+}
+/** Child Astryx components: the typed content slot (AST-082 FR4). */
+ | {
+    kind: 'content';
 } | {
     kind: 'named';
     name: string;
@@ -53,5 +62,7 @@ export interface ComponentContract {
     readonly platforms: Readonly<Partial<Record<NativePlatform, PropMap>>>;
     /** Core-doc props that stay in the web contract. */
     readonly webOnly: readonly WebOnlyProp[];
+    /** Core props that share a toolkit name with the same meaning (FR8). */
+    readonly sameMeaning?: readonly string[];
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/contract/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/contract/types.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAEpD,+EAA+E;AAC/E,MAAM,MAAM,QAAQ,GAChB;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAC,GAChB;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAC,GAChB;IAAC,IAAI,EAAE,SAAS,CAAA;CAAC,GACjB;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;CAAC,GACzC;IAAC,IAAI,EAAE,OAAO,CAAC;IAAC,EAAE,EAAE,QAAQ,CAAA;CAAC,GAC7B;IAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAA;CAAC,GAC5D;IAAC,IAAI,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,SAAS,QAAQ,EAAE,CAAA;CAAC,GACvC;IAAC,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,CAAC;AAElC,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;AAEzD,sEAAsE;AACtE,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,WAAW,CAAC;AAEtE,iEAAiE;AACjE,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,2EAA2E;IAC3E,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAClD,0DAA0D;IAC1D,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,uEAAuE;IACvE,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACvE,oDAAoD;IACpD,QAAQ,CAAC,OAAO,EAAE,SAAS,WAAW,EAAE,CAAC;CAC1C"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/contract/types.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAEpD,+EAA+E;AAC/E,MAAM,MAAM,QAAQ,GAChB;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAC,GAChB;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAC,GAChB;IAAC,IAAI,EAAE,SAAS,CAAA;CAAC,GACjB;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;CAAC;AAC3C,0EAA0E;GACxE;IAAC,IAAI,EAAE,YAAY,CAAC;IAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;CAAC,GAC/C;IAAC,IAAI,EAAE,OAAO,CAAC;IAAC,EAAE,EAAE,QAAQ,CAAA;CAAC,GAC7B;IAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAA;CAAC,GAC5D;IAAC,IAAI,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,SAAS,QAAQ,EAAE,CAAA;CAAC;AACzC,qEAAqE;GACnE;IAAC,IAAI,EAAE,SAAS,CAAA;CAAC,GACjB;IAAC,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,CAAC;AAElC,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;AAEzD,sEAAsE;AACtE,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,WAAW,CAAC;AAEtE,iEAAiE;AACjE,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,2EAA2E;IAC3E,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAClD,0DAA0D;IAC1D,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,uEAAuE;IACvE,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACvE,oDAAoD;IACpD,QAAQ,CAAC,OAAO,EAAE,SAAS,WAAW,EAAE,CAAC;IACzC,wEAAwE;IACxE,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1C"}