@mirascript/typed 0.1.63 → 0.1.65

package/src/simplifier.ts

@@ -0,0 +1,327 @@
+import type { GenericType, RecordField, RecordType, Type } from './parser.js';
+
+/** Controls which type simplifications are applied. */
+export interface SimplifyOptions {
+    /** Flatten nested union nodes. */
+    flattenUnions?: boolean;
+    /** Flatten nested intersection nodes. */
+    flattenIntersections?: boolean;
+    /** Remove duplicate members inside union nodes. */
+    deduplicateUnions?: boolean;
+    /** Remove duplicate members inside intersection nodes. */
+    deduplicateIntersections?: boolean;
+    /** Remove single-member union nodes. */
+    unwrapSingleUnion?: boolean;
+    /** Remove single-member intersection nodes. */
+    unwrapSingleIntersection?: boolean;
+    /** Distribute intersections over unions. */
+    distributeIntersectionsOverUnions?: boolean;
+    /** Merge intersections of explicit record fields. */
+    mergeRecordIntersections?: boolean;
+    /** Inline tuple spread elements (..[A, B] → A, B). */
+    expandTupleSpreads?: boolean;
+}
+
+const DEFAULT_OPTIONS: Required<SimplifyOptions> = {
+    flattenUnions: true,
+    flattenIntersections: true,
+    deduplicateUnions: true,
+    deduplicateIntersections: true,
+    unwrapSingleUnion: true,
+    unwrapSingleIntersection: true,
+    distributeIntersectionsOverUnions: true,
+    mergeRecordIntersections: true,
+    expandTupleSpreads: true,
+};
+
+/** Fills in default simplification options. */
+function normalizeOptions(options?: SimplifyOptions): Required<SimplifyOptions> {
+    return { ...DEFAULT_OPTIONS, ...options };
+}
+
+/** Checks whether a type is represented by an object node. */
+function isTypeObject(type: Type): type is Exclude<Type, GenericType | string> {
+    return typeof type === 'object';
+}
+
+/** Checks whether a record type uses the explicit fields form. */
+function isFieldRecordType(type: Type): type is Extract<RecordType, { fields: RecordField[] }> {
+    return isTypeObject(type) && type.kind === 'record' && 'fields' in type;
+}
+
+/** Builds a stable key for type-level deduplication within one simplify call. */
+function getTypeDedupKey(type: Type, symbols: Map<symbol, number>): string {
+    if (typeof type === 'string') return `string:${type}`;
+    if (typeof type === 'symbol') {
+        const existing = symbols.get(type);
+        if (existing != null) return `symbol:${existing}`;
+        const next = symbols.size + 1;
+        symbols.set(type, next);
+        return `symbol:${next}`;
+    }
+    switch (type.kind) {
+        case 'array':
+            return `array:${getTypeDedupKey(type.element, symbols)}`;
+        case 'union':
+            return `union:[${type.types.map((t) => getTypeDedupKey(t, symbols)).join(',')}]`;
+        case 'intersection':
+            return `intersection:[${type.types.map((t) => getTypeDedupKey(t, symbols)).join(',')}]`;
+        case 'record':
+            if ('fields' in type) {
+                return `recordFields:[${type.fields
+                    .map((f) => `${f.name}:${String(Boolean(f.optional))}:${getTypeDedupKey(f.type, symbols)}`)
+                    .join(',')}]`;
+            }
+            return `recordKV:${type.key == null ? 'none' : getTypeDedupKey(type.key, symbols)}:${getTypeDedupKey(type.value, symbols)}`;
+        case 'literal':
+            return `literal:${typeof type.value}:${String(type.value)}`;
+        case 'template':
+            return `template:[${type.parts.map((p) => getTypeDedupKey(p, symbols)).join(',')}]`;
+        case 'function':
+            return `function:${
+                type.name ?? ''
+            }:<${(type.typeParams ?? []).map((p) => getTypeDedupKey(p, symbols)).join(',')}>(${type.params
+                .map((p) => `${p.name}:${String(Boolean(p.spread))}:${getTypeDedupKey(p.type, symbols)}`)
+                .join(',')})=>${type.returns == null ? 'void' : getTypeDedupKey(type.returns, symbols)}`;
+        case 'tuple':
+            return `tuple:[${type.elements
+                .map((e) => `${String(Boolean(e.spread))}:${getTypeDedupKey(e.type, symbols)}`)
+                .join(',')}]`;
+        case 'reflection':
+            return `reflection:${type.name}`;
+        default:
+            return 'unknown';
+    }
+}
+
+/** Removes duplicate members from union/intersection type member lists. */
+function deduplicateTypeMembers(types: Type[]): Type[] {
+    const symbols = new Map<symbol, number>();
+    const seen = new Set<string>();
+    const result: Type[] = [];
+    for (const type of types) {
+        const key = getTypeDedupKey(type, symbols);
+        if (seen.has(key)) continue;
+        seen.add(key);
+        result.push(type);
+    }
+    return result;
+}
+
+/** Flattens nested union nodes when the corresponding option is enabled. */
+function flattenUnionTypes(types: Type[], options: Required<SimplifyOptions>): Type[] {
+    if (!options.flattenUnions) return types;
+    const result: Type[] = [];
+    for (const type of types) {
+        if (isTypeObject(type) && type.kind === 'union') {
+            result.push(...flattenUnionTypes(type.types, options));
+        } else {
+            result.push(type);
+        }
+    }
+    return result;
+}
+
+/** Flattens nested intersection nodes when the corresponding option is enabled. */
+function flattenIntersectionTypes(types: Type[], options: Required<SimplifyOptions>): Type[] {
+    if (!options.flattenIntersections) return types;
+    const result: Type[] = [];
+    for (const type of types) {
+        if (isTypeObject(type) && type.kind === 'intersection') {
+            result.push(...flattenIntersectionTypes(type.types, options));
+        } else {
+            result.push(type);
+        }
+    }
+    return result;
+}
+
+/** Simplifies a record field recursively. */
+function simplifyRecordField(field: RecordField, options: Required<SimplifyOptions>): RecordField {
+    return {
+        ...field,
+        type: simplifyImpl(field.type, options),
+    };
+}
+
+/** Merges explicit record fields across an intersection. */
+function mergeRecordFieldIntersections(types: Array<Extract<RecordType, { fields: RecordField[] }>>): Type {
+    const merged = new Map<string, { optional: boolean; type: Type }>();
+    for (const record of types) {
+        for (const field of record.fields) {
+            const prev = merged.get(field.name);
+            if (prev == null) {
+                merged.set(field.name, {
+                    optional: field.optional ?? false,
+                    type: field.type,
+                });
+                continue;
+            }
+            merged.set(field.name, {
+                optional: (prev.optional ?? false) && (field.optional ?? false),
+                type: {
+                    kind: 'intersection',
+                    types: [prev.type, field.type],
+                },
+            });
+        }
+    }
+
+    return {
+        kind: 'record',
+        fields: Array.from(merged.entries()).map(([name, field]) => ({
+            name,
+            optional: field.optional,
+            type: field.type,
+        })),
+    };
+}
+
+/** Distributes intersections over unions using a cartesian product. */
+function distributeIntersectionsOverUnions(types: Type[], options: Required<SimplifyOptions>): Type {
+    let combinations: Type[][] = [[]];
+    for (const type of types) {
+        const choices = isTypeObject(type) && type.kind === 'union' ? type.types : [type];
+        const next: Type[][] = [];
+        for (const combo of combinations) {
+            for (const choice of choices) {
+                next.push([...combo, choice]);
+            }
+        }
+        combinations = next;
+    }
+
+    const branches = combinations.map((combo) =>
+        simplifyImpl(
+            { kind: 'intersection', types: combo },
+            {
+                ...options,
+                distributeIntersectionsOverUnions: false,
+            },
+        ),
+    );
+    if (branches.length === 1) return branches[0]!;
+    return { kind: 'union', types: branches };
+}
+
+/** Simplifies a Type AST in place, optionally disabling individual normalization passes. */
+function simplifyImpl(type: Type, config: Required<SimplifyOptions>): Type {
+    if (typeof type === 'symbol' || typeof type === 'string') {
+        return type;
+    }
+
+    if (type.kind === 'array') {
+        type.element = simplifyImpl(type.element, config);
+        return type;
+    }
+
+    if (type.kind === 'function') {
+        for (const param of type.params) {
+            param.type = simplifyImpl(param.type, config);
+        }
+        if (type.returns != null) type.returns = simplifyImpl(type.returns, config);
+        return type;
+    }
+
+    if (type.kind === 'literal') {
+        return type;
+    }
+
+    if (type.kind === 'template') {
+        type.parts = type.parts.map((part) => simplifyImpl(part, config));
+        return type;
+    }
+
+    if (type.kind === 'tuple') {
+        type.elements = type.elements.flatMap((element) => {
+            const simplifiedType = simplifyImpl(element.type, config);
+            if (
+                config.expandTupleSpreads &&
+                element.spread &&
+                typeof simplifiedType === 'object' &&
+                simplifiedType.kind === 'tuple'
+            ) {
+                // Inline tuple spread: ..[A, B] → A, B
+                return simplifiedType.elements;
+            }
+            return [{ ...element, type: simplifiedType }];
+        });
+        return type;
+    }
+
+    if (type.kind === 'reflection') {
+        return type;
+    }
+
+    if (type.kind === 'record') {
+        if ('fields' in type) {
+            type.fields = type.fields.map((field) => simplifyRecordField(field, config));
+        } else {
+            if (type.key != null) type.key = simplifyImpl(type.key, config);
+            type.value = simplifyImpl(type.value, config);
+        }
+        return type;
+    }
+
+    if (type.kind === 'union') {
+        let simplifiedTypes = flattenUnionTypes(
+            type.types.map((item) => simplifyImpl(item, config)),
+            config,
+        );
+        if (config.deduplicateUnions) {
+            simplifiedTypes = deduplicateTypeMembers(simplifiedTypes);
+        }
+        if (config.unwrapSingleUnion && simplifiedTypes.length === 1) {
+            return simplifiedTypes[0]!;
+        }
+        type.types = simplifiedTypes;
+        return type;
+    }
+
+    if (type.kind === 'intersection') {
+        let simplifiedTypes = flattenIntersectionTypes(
+            type.types.map((item) => simplifyImpl(item, config)),
+            config,
+        );
+        if (config.deduplicateIntersections) {
+            simplifiedTypes = deduplicateTypeMembers(simplifiedTypes);
+        }
+        if (
+            config.distributeIntersectionsOverUnions &&
+            simplifiedTypes.some((item) => isTypeObject(item) && item.kind === 'union')
+        ) {
+            return distributeIntersectionsOverUnions(simplifiedTypes, config);
+        }
+        if (config.mergeRecordIntersections) {
+            const recordTypes = simplifiedTypes.filter(isFieldRecordType);
+            if (recordTypes.length >= 2) {
+                const nonRecordTypes = simplifiedTypes.filter((item) => !isFieldRecordType(item));
+                const mergedRecord = simplifyImpl(mergeRecordFieldIntersections(recordTypes), config);
+                let mergedTypes = [mergedRecord, ...nonRecordTypes];
+                if (config.deduplicateIntersections) {
+                    mergedTypes = deduplicateTypeMembers(mergedTypes);
+                }
+                if (config.unwrapSingleIntersection && mergedTypes.length === 1) {
+                    return mergedTypes[0]!;
+                }
+                type.types = mergedTypes;
+                return type;
+            }
+        }
+        if (config.unwrapSingleIntersection && simplifiedTypes.length === 1) {
+            return simplifiedTypes[0]!;
+        }
+        type.types = simplifiedTypes;
+        return type;
+    }
+
+    /* c8 ignore next 3 */
+    (type) satisfies never;
+    return type;
+}
+
+/** Simplifies a Type AST in place, optionally disabling individual normalization passes. */
+export function simplify(type: Type, options?: SimplifyOptions): Type {
+    const config = normalizeOptions(options);
+    return simplifyImpl(type, config);
+}

package/src/stringify.ts

@@ -0,0 +1,191 @@
+import { REG_IDENTIFIER_FULL } from '@mirascript/constants';
+import type { Type } from './parser.js';
+
+/** Precedence levels for parenthesization. */
+const PREC_UNION = 1;
+const PREC_INTERSECTION = 2;
+
+/** Escape a string literal value for use in double-quoted strings. */
+function escapeString(value: string): string {
+    return value
+        .replaceAll('\\', '\\\\')
+        .replaceAll('"', String.raw`\"`)
+        .replaceAll('\n', String.raw`\n`)
+        .replaceAll('\r', String.raw`\r`)
+        .replaceAll('\t', String.raw`\t`)
+        .replaceAll('$', String.raw`\$`);
+}
+
+/**
+ * Returns the precedence level of a type node.
+ * Higher number = tighter binding.
+ */
+function getPrecedence(type: Type): number {
+    if (typeof type === 'string' || typeof type === 'symbol') return 0;
+    if (type.kind === 'union') return PREC_UNION;
+    if (type.kind === 'intersection') return PREC_INTERSECTION;
+    return 0;
+}
+
+/**
+ * Stringify a type, adding parentheses if the child's precedence
+ * is lower than the parent's required precedence.
+ */
+function stringifyImpl(type: Type, parentPrecedence: number): string {
+    // ---- primitives ----
+    if (typeof type === 'symbol') {
+        return type.description ?? '';
+    }
+    if (typeof type === 'string') {
+        return type;
+    }
+
+    // ---- compound types ----
+    let result: string;
+
+    switch (type.kind) {
+        case 'literal': {
+            if (typeof type.value === 'boolean') {
+                return String(type.value);
+            } else {
+                return `"${escapeString(type.value)}"`;
+            }
+        }
+
+        case 'template': {
+            let tpl = '`';
+            for (const part of type.parts) {
+                if (typeof part === 'object' && part.kind === 'literal' && typeof part.value === 'string') {
+                    tpl += part.value.replaceAll('`', '\\`').replaceAll('$', String.raw`\$`);
+                } else {
+                    tpl += `$(${stringifyImpl(part, 0)})`;
+                }
+            }
+            tpl += '`';
+            return tpl;
+        }
+
+        case 'array': {
+            const inner = stringifyImpl(type.element, 0);
+            // Use postfix notation for simple types, generic for complex
+            if (typeof type.element === 'string' || typeof type.element === 'symbol') {
+                result = `${inner}[]`;
+            } else if (type.element.kind === 'literal' || type.element.kind === 'reflection') {
+                result = `${inner}[]`;
+            } else {
+                return `array<${inner}>`;
+            }
+            break;
+        }
+
+        case 'union': {
+            const parts = type.types.map((t) => stringifyImpl(t, PREC_UNION));
+            result = parts.join(' | ');
+            if (parentPrecedence > PREC_UNION) return `(${result})`;
+            return result;
+        }
+
+        case 'intersection': {
+            const parts = type.types.map((t) => stringifyImpl(t, PREC_INTERSECTION));
+            result = parts.join(' & ');
+            if (parentPrecedence > PREC_INTERSECTION) return `(${result})`;
+            return result;
+        }
+
+        case 'record': {
+            if ('fields' in type) {
+                if (type.fields.length === 0) {
+                    return '()';
+                }
+                // Check if all fields are anonymous (name === positional index)
+                const allAnonymous = type.fields.every((f, i) => f.name === String(i) && !f.optional);
+                if (allAnonymous) {
+                    const types = type.fields.map((f) => stringifyImpl(f.type, 0));
+                    // Single anonymous field needs trailing comma to distinguish from grouping
+                    const trailing = type.fields.length === 1 ? ',' : '';
+                    return `(${types.join(', ')}${trailing})`;
+                } else {
+                    const fields = type.fields.map((f) => {
+                        const name = REG_IDENTIFIER_FULL.test(f.name) ? f.name : `"${escapeString(f.name)}"`;
+                        const colon = f.optional ? '?:' : ':';
+                        const typeStr = stringifyImpl(f.type, 0);
+                        return `${name}${colon} ${typeStr}`;
+                    });
+                    return `(${fields.join(', ')})`;
+                }
+            }
+
+            // Generic record
+            if (type.key == null) {
+                return `record<${stringifyImpl(type.value, 0)}>`;
+            } else {
+                return `record<${stringifyImpl(type.key, 0)}, ${stringifyImpl(type.value, 0)}>`;
+            }
+        }
+
+        case 'function': {
+            let fn = 'fn';
+            if (type.name != null) fn += ` ${type.name}`;
+            if (type.typeParams != null && type.typeParams.length > 0) {
+                fn += `<${type.typeParams.map((t) => stringifyImpl(t, 0)).join(', ')}>`;
+            }
+            const params = type.params.map((p) => {
+                const spread = p.spread ? '..' : '';
+                const name = p.name || (p.spread ? '' : '_');
+                const typeStr = p.type === 'any' && !p.spread ? '' : `: ${stringifyImpl(p.type, 0)}`;
+                return `${spread}${name}${typeStr}`;
+            });
+            fn += `(${params.join(', ')})`;
+            if (type.returns != null) {
+                const ret = stringifyImpl(type.returns, 0);
+                const needsParens =
+                    typeof type.returns === 'object' &&
+                    (type.returns.kind === 'union' || type.returns.kind === 'intersection');
+                fn += ` -> ${needsParens ? `(${ret})` : ret}`;
+            }
+            result = fn;
+            // Function types need parens inside union / intersection
+            if (parentPrecedence > 0) return `(${result})`;
+            return result;
+        }
+
+        case 'tuple': {
+            if (type.elements.length === 0) {
+                result = '[]';
+            } else {
+                const elements = type.elements.map((e) => {
+                    const spread = e.spread ? '..' : '';
+                    return `${spread}${stringifyImpl(e.type, 0)}`;
+                });
+                result = `[${elements.join(', ')}]`;
+            }
+            break;
+        }
+
+        case 'reflection': {
+            result = `type(${type.name})`;
+            break;
+        }
+
+        /* c8 ignore next 3 */
+        default:
+            (type) satisfies never;
+            return 'unknown';
+    }
+
+    // Wrap in parens if needed (for non-union/intersection types that
+    // appear inside higher-precedence context, e.g. function in union)
+    const childPrec = getPrecedence(type);
+    if (parentPrecedence > childPrec) {
+        return `(${result})`;
+    }
+    return result;
+}
+
+/**
+ * Converts a Type AST back into a MiraScript type string.
+ * The output is guaranteed to be parseable by {@link parse}.
+ */
+export function stringify(type: Type): string {
+    return stringifyImpl(type, 0);
+}

package/src/type.peggy

@@ -37,6 +37,11 @@ function union(types) {
   return { kind: "union", types };
 }
 
+function intersection(types) {
+  if (types.length === 1) return types[0];
+  return { kind: "intersection", types };
+}
+
 function record(fields) {
   for(let i = 0; i < fields.length; i++) {
     fields[i].name ??= String(i);
@@ -55,6 +60,10 @@ function string(parts) {
   }
   return { kind: 'template', parts };
 }
+
+function tupleElement(type, spread) {
+  return { type, spread: spread ?? false };
+}
 }
 
 Start
@@ -62,17 +71,22 @@ Start
   / _ @Type _
 
 ///////////////////////////////////////////////////////////////////////////////
-// Type (union)
+// Type (union / intersection)
 ///////////////////////////////////////////////////////////////////////////////
 
 Type
   = UnionType
 
 UnionType
-  = _ ( "|" _ )? u:PostfixType|1.., _ "|" _ | {
+  = _ ( "|" _ )? u:IntersectionType|1.., _ "|" _ | {
       return union(u);
     }
 
+IntersectionType
+  = _ ( "&" _ )? i:PostfixType|1.., _ "&" _ | {
+      return intersection(i);
+    }
+
 ///////////////////////////////////////////////////////////////////////////////
 // Array
 ///////////////////////////////////////////////////////////////////////////////
@@ -91,6 +105,8 @@ PostfixType
 
 PrimaryType
   = FunctionType
+  / ReflectionType
+  / TupleType
   / name:Identifier generic:(_ "<" _ @TypeArgList _ ">")? {
       if (generic) {
         if (name === 'array') {
@@ -110,6 +126,10 @@ PrimaryType
       if (BUILT_IN_TYPES.has(name)) {
         return name;
       }
+      // `type` is a non-reserved keyword — allow it as a plain named type
+      if (name === 'type') {
+        return name;
+      }
       return named(name);
     }
   / lit:String {
@@ -120,6 +140,33 @@ PrimaryType
   / RecordType
 
 
+///////////////////////////////////////////////////////////////////////////////
+// Reflection
+///////////////////////////////////////////////////////////////////////////////
+
+ReflectionType
+  = "type" _ "(" _ name:Identifier _ ")" {
+      return { kind: "reflection", name };
+    }
+
+///////////////////////////////////////////////////////////////////////////////
+// Tuple
+///////////////////////////////////////////////////////////////////////////////
+
+TupleType
+  = "[" _ elements:TupleElementList? _ "]" {
+      return { kind: "tuple", elements: elements ?? [] };
+    }
+
+TupleElementList
+  = @TupleElement|1.., _ "," _ | ( _ "," _ )?
+
+TupleElement
+  = spread:".."? _ type:Type {
+      return tupleElement(type, spread != null);
+    }
+
+
 ///////////////////////////////////////////////////////////////////////////////
 // Generics
 ///////////////////////////////////////////////////////////////////////////////