luaut-parser 1.2.0 → 2.1.0

package/dist/index.js

@@ -852,6 +852,9 @@ var Parser = class {
     }
     if (t.type === "Identifier" && t.value === "declare") {
       const p1 = this.peek(1);
+      if (p1.type === "Identifier" && p1.value === "class" && this.peek(2).type === "Identifier") {
+        return this.parseDeclareClassStatement();
+      }
       if (p1.type === "Identifier" || p1.type === "Keyword" && p1.value === "function") {
         return this.parseDeclareStatement();
       }
@@ -893,6 +896,36 @@ var Parser = class {
     const valueType = this.parseType();
     return { type: "DeclareStatement", name: nameTok.value, id: tokenIdentifier(nameTok), valueType, ...spanFrom(start, this.previous()) };
   }
+  /** A declared type's name. It may be qualified once — `Enum.Material` —
+   *  which is how a definitions file names types under a namespace, and how
+   *  they are then written (`const m: Enum.Material`). */
+  parseTypeName() {
+    const first = this.expectIdentifier();
+    if (this.checkPunctuator(".") && this.peek(1).type === "Identifier") {
+      this.advance();
+      const second = this.expectIdentifier();
+      return { type: "Identifier", name: `${first.value}.${second.value}`, ...spanFrom(first, second) };
+    }
+    return tokenIdentifier(first);
+  }
+  // `declare class Name extends Base { member: T, ... }`
+  parseDeclareClassStatement() {
+    const start = this.current();
+    this.advance();
+    this.advance();
+    const name = this.parseTypeName();
+    let superclass;
+    if (this.checkIdentifierValue("extends")) {
+      this.advance();
+      const base = this.parseType();
+      if (base.type !== "TypeReference") this.error("A class can only extend another class, written by name");
+      superclass = base;
+    }
+    if (!this.checkPunctuator("{")) this.error("Expected '{' to start the class body");
+    const body = this.parseTableType();
+    if (body.type !== "TableTypeNode") this.error("A class body lists members ('name: T'), not a mapped type");
+    return { type: "DeclareClassStatement", name, superclass, body, ...spanFrom(start, this.previous()) };
+  }
   // `import { a, b as c } from '...'` / `import Default from '...'` /
   // `import Default, { a } from '...'`. Compiled away entirely by the
   // bundler — never survives into emitted Luau.
@@ -1223,8 +1256,7 @@ var Parser = class {
   parseTypeAliasStatement() {
     const start = this.current();
     this.advance();
-    const nameTok = this.expectIdentifier();
-    const name = { type: "Identifier", name: nameTok.value, ...spanFrom(nameTok, nameTok) };
+    const name = this.parseTypeName();
     let generics = [];
     if (this.checkOperator("<")) {
       generics = this.parseGenericTypeParameterList();
@@ -2726,6 +2758,9 @@ var Analyzer = class {
       case "DeclareStatement":
         this.visitType(stmt.valueType, scope);
         return;
+      case "DeclareClassStatement":
+        this.visitType(stmt.body, scope);
+        return;
       case "TypeAliasStatement":
       case "ExportTypeAliasStatement":
         this.visitType(stmt.definition, scope);
@@ -2899,6 +2934,9 @@ function analyzeScopes(program, options = {}) {
 }
 
 // src/ast/typeModel.ts
+function isClassType(t) {
+  return t.kind === "object" && t.class !== void 0;
+}
 function typeParam(name, constraint, isConst) {
   return { kind: "typeParam", name, constraint, isConst };
 }
@@ -2958,10 +2996,16 @@ function substitute(t, subst) {
     }
     case "function": {
       const inner = t.typeParams ? new Map([...subst].filter(([k]) => !t.typeParams.includes(k))) : subst;
+      let params = t.params.map((p) => ({ ...p, type: substitute(p.type, inner) }));
+      let varargs = t.varargs && substitute(t.varargs, inner);
+      if (varargs?.kind === "tuple" && varargs.isPack) {
+        params = [...params, ...varargs.elements.map((type) => ({ type }))];
+        varargs = void 0;
+      }
       return {
         kind: "function",
-        params: t.params.map((p) => ({ ...p, type: substitute(p.type, inner) })),
-        varargs: t.varargs && substitute(t.varargs, inner),
+        params,
+        varargs,
         returns: substitute(t.returns, inner),
         typeParams: t.typeParams,
         predicate: t.predicate && {
@@ -3041,7 +3085,8 @@ function unify(param, arg, vars, out) {
       }
       return;
     case "object":
-      if (arg.kind === "object") {
+      if (param.class) return;
+      if (arg.kind === "object" && !arg.class) {
         for (const [k, pv] of param.properties) {
           const av = arg.properties.get(k);
           if (av) unify(pv.type, av.type, vars, out);
@@ -3124,7 +3169,7 @@ function widen(t) {
     case "tuple":
       return tuple(t.elements.map(widen), t.isPack);
     case "object": {
-      if (t.frozen) return t;
+      if (t.frozen || t.class) return t;
       const entries = [];
       for (const [k, v] of t.properties) entries.push([k, { ...v, type: widen(v.type) }]);
       const w = objectType(entries, t.indexer && { key: t.indexer.key, value: widen(t.indexer.value) });
@@ -3151,6 +3196,10 @@ function isAssignable(rawA, rawB) {
   if (expandAlias) {
     if (a.kind === "genericRef" && b.kind !== "genericRef") a = expandAlias(a);
     else if (b.kind === "genericRef" && a.kind !== "genericRef") b = expandAlias(b);
+    else if (a.kind === "genericRef" && b.kind === "genericRef" && a.name !== b.name) {
+      a = expandAlias(a);
+      b = expandAlias(b);
+    }
     if (a === b) return true;
   }
   for (let i = 0; i < comparing.length; i += 2) {
@@ -3176,7 +3225,11 @@ function isAssignableInner(a, b) {
   if (a.kind === "union") return a.types.every((t) => isAssignable(t, b));
   if (b.kind === "union") return b.types.some((t) => isAssignable(a, t));
   if (b.kind === "intersection") return b.types.every((t) => isAssignable(a, t));
-  if (a.kind === "intersection") return a.types.some((t) => isAssignable(t, b));
+  if (a.kind === "intersection") {
+    if (a.types.some((t) => isAssignable(t, b))) return true;
+    const merged = mergeObjectMembers(a.types);
+    return merged !== void 0 && isAssignable(merged, b);
+  }
   if (a.kind === "literal") {
     if (b.kind === "literal") return a.value === b.value;
     if (b.kind === "primitive") return b.name === a.base;
@@ -3202,6 +3255,8 @@ function isAssignableInner(a, b) {
   }
   if (a.kind === "object") {
     if (b.kind !== "object") return false;
+    if (b.class) return a.class !== void 0 && a.class.ancestors.includes(b.class.name);
+    if (a.class && (b.indexer || b.properties.size === 0)) return false;
     for (const [name, bp] of b.properties) {
       const ap = a.properties.get(name);
       if (!ap) {
@@ -3344,6 +3399,7 @@ function containsFreeTypeParam(t, seen, bound) {
     case "intersection":
       return t.types.some((m) => containsTypeParam(m, seen, bound));
     case "object":
+      if (t.class) return false;
       return [...t.properties.values()].some((v) => containsTypeParam(v.type, seen, bound)) || !!t.indexer && (containsTypeParam(t.indexer.key, seen, bound) || containsTypeParam(t.indexer.value, seen, bound));
     case "function": {
       const inner = t.typeParams?.length ? /* @__PURE__ */ new Set([...bound, ...t.typeParams]) : bound;
@@ -3531,6 +3587,39 @@ var IDENT_KEY = /^[A-Za-z_][A-Za-z0-9_]*$/;
 function formatKey(k) {
   return IDENT_KEY.test(k) ? k : JSON.stringify(k);
 }
+function mergeObjectMembers(types) {
+  const objects = [];
+  const seen = /* @__PURE__ */ new Set();
+  const collect = (t) => {
+    if (seen.has(t)) return true;
+    seen.add(t);
+    if (t.kind === "genericRef") {
+      const expanded = expandAlias?.(t);
+      return expanded !== void 0 && expanded !== t && collect(expanded);
+    }
+    if (t.kind === "intersection") return t.types.every(collect);
+    if (t.kind === "object" && !t.class) {
+      objects.push(t);
+      return true;
+    }
+    return false;
+  };
+  if (!types.every(collect) || objects.length < 2) return void 0;
+  const properties = /* @__PURE__ */ new Map();
+  let indexer;
+  for (const object of objects) {
+    indexer ??= object.indexer;
+    for (const [name, property] of object.properties) {
+      const existing = properties.get(name);
+      properties.set(name, existing ? {
+        type: intersection([existing.type, property.type]),
+        optional: existing.optional && property.optional,
+        readonly: existing.readonly || property.readonly
+      } : property);
+    }
+  }
+  return objectType([...properties], indexer);
+}
 
 // src/ast/analyzeTypes.ts
 function analyzeTypes(program, scopes, options = {}) {
@@ -3721,6 +3810,62 @@ function keepsLiterals(paramType) {
   const members = paramType.constraint.kind === "union" ? paramType.constraint.types : [paramType.constraint];
   return members.some((m) => m.kind === "literal");
 }
+var AliasMap = class extends Map {
+  pending = /* @__PURE__ */ new Map();
+  defer(name, resolve5) {
+    super.delete(name);
+    this.pending.set(name, resolve5);
+  }
+  get(name) {
+    const resolved = super.get(name);
+    if (resolved !== void 0) return resolved;
+    const resolve5 = this.pending.get(name);
+    if (!resolve5) return void 0;
+    this.pending.delete(name);
+    const type = resolve5();
+    super.set(name, type);
+    return type;
+  }
+  has(name) {
+    return super.has(name) || (this.pending?.has(name) ?? false);
+  }
+  set(name, type) {
+    this.pending?.delete(name);
+    return super.set(name, type);
+  }
+  delete(name) {
+    const deferred = this.pending?.delete(name) ?? false;
+    return super.delete(name) || deferred;
+  }
+  get size() {
+    return super.size + (this.pending?.size ?? 0);
+  }
+  keys() {
+    return [...super.keys(), ...this.pending?.keys() ?? []][Symbol.iterator]();
+  }
+  entries() {
+    return [...this.keys()].map((name) => [name, this.get(name)])[Symbol.iterator]();
+  }
+  values() {
+    return [...this.keys()].map((name) => this.get(name))[Symbol.iterator]();
+  }
+  forEach(callback, thisArg) {
+    for (const [name, type] of this.entries()) callback.call(thisArg, type, name, this);
+  }
+  [Symbol.iterator]() {
+    return this.entries();
+  }
+};
+var METAMETHODS = {
+  "+": "__add",
+  "-": "__sub",
+  "*": "__mul",
+  "/": "__div",
+  "//": "__idiv",
+  "%": "__mod",
+  "^": "__pow",
+  "..": "__concat"
+};
 function posKey(name, line, column) {
   return `${name}@${line}:${column}`;
 }
@@ -3741,9 +3886,12 @@ var TypeAnalyzer = class {
   expectedTypeOf = /* @__PURE__ */ new Map();
   /** Public: each alias resolved once (generic aliases keep their params as
    *  `typeParam` nodes in the body). */
-  aliases = /* @__PURE__ */ new Map();
+  aliases = new AliasMap();
   /** Uninstantiated alias definitions, for `Name<Args>` instantiation. */
   aliasDefs = /* @__PURE__ */ new Map();
+  /** See `resolveClass`. */
+  classTypes = /* @__PURE__ */ new WeakMap();
+  classMembers = /* @__PURE__ */ new WeakMap();
   /** Generic parameters currently in lexical scope (alias body / generic fn),
    *  with their `extends` constraints resolved. */
   typeParamScope = [];
@@ -3853,24 +4001,123 @@ var TypeAnalyzer = class {
     for (const stmt of block.statements) {
       const alias = stmt.type === "TypeAliasStatement" ? stmt : stmt.type === "ExportTypeAliasStatement" ? stmt.alias : void 0;
       if (alias) this.aliasDefs.set(alias.name.name, { params: alias.generics, node: alias.definition });
+      if (stmt.type === "DeclareClassStatement") {
+        this.aliasDefs.set(stmt.name.name, { params: [], node: stmt.body, class: stmt });
+      }
     }
   }
-  /** Seed global types from `declare` statements. Repeating a name builds an
-   *  *overload set* (an intersection, in declaration order) rather than
-   *  replacing — which is how `typeof` gets one signature per result string. */
+  /** A non-generic definition's type. */
+  resolveDef(def) {
+    return def.class ? this.classType(def.class) : this.resolveType(def.node);
+  }
+  /** One type per class declaration, so every mention of a class is the same
+   *  object — its own members included, which refer back to it. */
+  classType(stmt) {
+    return this.classTypes.get(stmt) ?? this.resolveClass(stmt);
+  }
+  /** A class's members are resolved the first time anyone asks for
+   *  `properties` — its own from its body, the inherited ones from its
+   *  superclass.
+   *
+   *  Both have to wait. A definitions file for a whole engine declares
+   *  thousands of classes that all refer to one another; resolving each body
+   *  as soon as the class is named would resolve every class on every
+   *  analysis, when a script touches a handful. And classes refer to one
+   *  another constantly — `Object.IsA` mentions a map of every class, each
+   *  of which extends `Object` — so while one class resolves, one it extends
+   *  may itself be half-resolved; copying its members then would miss some
+   *  for good. */
+  resolveClass(stmt) {
+    const name = stmt.name.name;
+    const { ancestors, cyclic } = this.classChain(stmt);
+    const superclass = !cyclic && ancestors.length > 1 ? this.aliasDefs.get(ancestors[1])?.class : void 0;
+    let own;
+    let resolvingOwn = false;
+    const ownMembers = () => {
+      if (own || resolvingOwn) return own;
+      resolvingOwn = true;
+      try {
+        own = this.resolveType(stmt.body);
+      } finally {
+        resolvingOwn = false;
+      }
+      return own;
+    };
+    let complete;
+    const members = () => {
+      if (complete) return complete;
+      const mine = ownMembers();
+      if (!mine) return void 0;
+      const base = superclass ? this.classMembers.get(this.classType(superclass))?.() : void 0;
+      if (superclass && !base) return void 0;
+      return complete = {
+        properties: new Map([...base?.properties ?? [], ...mine.properties]),
+        indexer: mine.indexer ?? base?.indexer
+      };
+    };
+    const type = { kind: "object", name, class: { name, superclass: superclass?.name.name, ancestors } };
+    Object.defineProperties(type, {
+      properties: { enumerable: true, get: () => members()?.properties ?? own?.properties ?? /* @__PURE__ */ new Map() },
+      indexer: { enumerable: true, get: () => members()?.indexer ?? own?.indexer }
+    });
+    this.classTypes.set(stmt, type);
+    this.classMembers.set(type, members);
+    if (this.program.body.statements.includes(stmt)) ownMembers();
+    return type;
+  }
+  /** `extends` must name a class, and the chain must end. */
+  checkClass(stmt) {
+    if (!stmt.superclass || !this.emitDiagnostics) return;
+    const base = stmt.superclass.base;
+    if (!this.aliasDefs.get(base)?.class) {
+      const known = this.aliasDefs.has(base) || this.importedTypes.has(base);
+      this.diagnostics.push({
+        node: stmt.superclass,
+        message: known ? `'${base}' is not a class; a class can only extend another class` : `Cannot find class '${base}'`
+      });
+    } else if (this.classChain(stmt).cyclic) {
+      this.diagnostics.push({ node: stmt.superclass, message: `'${stmt.name.name}' cannot extend itself` });
+    }
+  }
+  /** The class and the classes it extends, nearest first, read from the
+   *  declarations — no type has to be resolved to know them. The walk stops
+   *  at a superclass that is not a class. */
+  classChain(stmt) {
+    const ancestors = [stmt.name.name];
+    for (let cls = stmt; cls?.superclass; ) {
+      const base = cls.superclass.base;
+      if (ancestors.includes(base)) return { ancestors, cyclic: true };
+      cls = this.aliasDefs.get(base)?.class;
+      if (!cls) break;
+      ancestors.push(base);
+    }
+    return { ancestors, cyclic: false };
+  }
+  /** Seed global types from `declare` statements. Repeating a function name
+   *  builds an *overload set* (an intersection, in declaration order) rather
+   *  than replacing — which is how `typeof` gets one signature per result
+   *  string. Any other value is simply redeclared: a sourcemap's
+   *  `declare script: <this file's instance>` replaces the library's
+   *  `declare script: LuaSourceContainer`. */
   harvestDeclares(block) {
     for (const stmt of block.statements) {
       if (stmt.type !== "DeclareStatement") continue;
       const t = this.resolveType(stmt.valueType);
       const prev = this.libGlobalTypes.get(stmt.name);
-      this.libGlobalTypes.set(stmt.name, prev ? intersection([prev, t]) : t);
+      const overload = prev && stmt.valueType.type === "FunctionTypeNode" && (prev.kind === "function" || prev.kind === "intersection");
+      this.libGlobalTypes.set(stmt.name, overload ? intersection([prev, t]) : t);
     }
   }
   resolveAllAliases() {
     for (const [name, def] of this.aliasDefs) {
+      if (def.class && !this.program.body.statements.includes(def.class)) {
+        const cls = def.class;
+        this.aliases.defer(name, () => this.classType(cls));
+        continue;
+      }
       if (containsTypeQuery(def.node)) continue;
       this.withTypeParams(def.params, () => {
-        this.aliases.set(name, this.resolveType(def.node));
+        this.aliases.set(name, this.resolveDef(def));
       });
     }
   }
@@ -3880,7 +4127,7 @@ var TypeAnalyzer = class {
     for (const [name, def] of this.aliasDefs) {
       if (this.aliases.has(name)) continue;
       this.withTypeParams(def.params, () => {
-        this.aliases.set(name, this.resolveType(def.node));
+        this.aliases.set(name, this.resolveDef(def));
       });
     }
     return this.aliases;
@@ -3908,10 +4155,7 @@ var TypeAnalyzer = class {
   /** Instantiate a generic alias: `Box<number>` -> `{ value: number }`. */
   instantiateAlias(def, args) {
     if (this.instantiationDepth > 20) return unknownType;
-    const subst = /* @__PURE__ */ new Map();
-    def.params.forEach((p, i) => {
-      subst.set(p.name, args[i] ?? (p.default ? this.resolveType(p.default) : unknownType));
-    });
+    const subst = this.bindTypeArguments(def.params, args);
     this.instantiationDepth++;
     try {
       const body = this.withTypeParams(def.params, () => this.resolveType(def.node));
@@ -3920,6 +4164,24 @@ var TypeAnalyzer = class {
       this.instantiationDepth--;
     }
   }
+  /** Pair written type arguments with the parameters they instantiate. A
+   *  pack parameter (`T...`) takes every argument from its position on, as
+   *  one pack: `Signal<Instance, string>` binds `T` to `(Instance, string)`,
+   *  and `Signal<()>` to the empty pack. Left out, a parameter takes its
+   *  default (`T... = ...any` is `any`), or `unknown`. */
+  bindTypeArguments(params, args) {
+    const subst = /* @__PURE__ */ new Map();
+    params.forEach((p, i) => {
+      let arg = args[i];
+      if (p.isPack && i < args.length) {
+        const rest = args.slice(i);
+        const single = rest.length === 1 ? rest[0] : void 0;
+        arg = single && (single.kind === "tuple" && single.isPack || single.kind === "typeParam" || single.kind === "any") ? single : tuple([...rest], true);
+      }
+      subst.set(p.name, arg ?? (p.default ? this.resolveType(p.default) : unknownType));
+    });
+    return subst;
+  }
   // --------------------------------------------------------
   // TypeNode -> Type
   // --------------------------------------------------------
@@ -3981,6 +4243,12 @@ var TypeAnalyzer = class {
           }
           const lib = this.options.libTypes?.[node.base];
           if (lib) return lib;
+        } else if (this.aliasDefs.has(name)) {
+          return this.expand({
+            kind: "genericRef",
+            name,
+            typeArguments: node.typeArguments.map((a) => this.resolveType(a))
+          });
         }
         return {
           kind: "genericRef",
@@ -4107,6 +4375,7 @@ var TypeAnalyzer = class {
         return this.resolveType(node.typeAnnotation);
       case "TypePackNode": {
         if (node.types.length === 1 && !node.hasVarargs) return this.resolveType(node.types[0]);
+        if (!node.types.length && node.varargType) return this.resolveType(node.varargType);
         return tuple(node.types.map((t) => this.resolveType(t)), true);
       }
     }
@@ -4130,7 +4399,7 @@ var TypeAnalyzer = class {
     this.reduceDepth++;
     try {
       const result = this.reduceTypeInner(t);
-      this.reduceCache.set(t, result);
+      if (result.kind !== "keyof") this.reduceCache.set(t, result);
       return result;
     } finally {
       this.reduceDepth--;
@@ -4142,6 +4411,7 @@ var TypeAnalyzer = class {
         case "keyof": {
           const target = this.reduceType(t.target);
           if (containsTypeParam(target)) return { kind: "keyof", target };
+          if (target.kind === "genericRef" && this.resolvingAliases.has(target.name)) return t;
           return this.keysOf(target);
         }
         case "indexedAccess": {
@@ -4183,6 +4453,7 @@ var TypeAnalyzer = class {
             t.predicate
           );
         case "object": {
+          if (t.class) return t;
           const entries = [];
           for (const [k, v] of t.properties) entries.push([k, { ...v, type: this.reduceType(v.type) }]);
           const reduced = objectType(entries, t.indexer && {
@@ -4322,6 +4593,7 @@ var TypeAnalyzer = class {
           t.typeParams
         );
       case "object": {
+        if (t.class) return t;
         const entries = [];
         for (const [k, v] of t.properties) entries.push([k, { ...v, type: this.stripInfer(v.type, bindings) }]);
         return objectType(entries, t.indexer && {
@@ -4375,6 +4647,11 @@ var TypeAnalyzer = class {
   visitStatement(stmt, env) {
     switch (stmt.type) {
       case "VariableDeclaration": {
+        stmt.names.forEach((target, i) => {
+          if (target.type === "IdentifierPattern" && target.typeAnnotation && stmt.init[i]) {
+            this.applyContext(stmt.init[i], this.resolveType(target.typeAnnotation));
+          }
+        });
         const { types: valueTypes, sources } = this.valueList(stmt.init, env);
         stmt.names.forEach((target, i) => {
           const inferred = valueTypes[i] ?? (stmt.init.length ? unknownType : nilType);
@@ -4435,6 +4712,16 @@ var TypeAnalyzer = class {
         return;
       }
       case "AssignmentStatement": {
+        stmt.targets.forEach((target, i) => {
+          const value = stmt.values[i];
+          if (!value) return;
+          if (target.type === "MemberExpression" || target.type === "IndexExpression") {
+            this.applyContext(value, this.infer(target, env));
+          } else if (target.type === "Identifier") {
+            const id = this.bindingIdOf(target);
+            if (id !== void 0 && this.annotated.has(id)) this.applyContext(value, this.bindingType.get(id));
+          }
+        });
         const { types: valueTypes, sources } = this.valueList(stmt.values, env);
         stmt.targets.forEach((target, i) => {
           const vt = valueTypes[i] ?? unknownType;
@@ -4579,6 +4866,9 @@ var TypeAnalyzer = class {
       case "BreakStatement":
         this.breakStates[this.breakStates.length - 1]?.push(forkEnv(env));
         return;
+      case "DeclareClassStatement":
+        this.checkClass(stmt);
+        return;
       case "ContinueStatement":
       case "TypeAliasStatement":
       case "ExportTypeAliasStatement":
@@ -4700,7 +4990,46 @@ var TypeAnalyzer = class {
     }
     if (p.pattern) return this.patternToType(p.pattern, env);
     if (p.default) return widen(this.infer(p.default, env));
-    return anyType;
+    return this.contextualParams.get(p) ?? anyType;
+  }
+  /** What a function expression's unannotated parameters are, from where
+   *  it is written — see `applyContext`. */
+  contextualParams = /* @__PURE__ */ new WeakMap();
+  /** `expected` is the type the surroundings want for `expr`. A function
+   *  expression written there takes its unannotated parameters' types from
+   *  it, as in TypeScript: `signal:Connect(function(player) ... end)` knows
+   *  `player` from `Connect`'s callback type. Anything else is inferred as
+   *  usual. */
+  applyContext(expr, expected) {
+    let e = expr;
+    while (e.type === "ParenthesizedExpression") e = e.expression;
+    if (e.type !== "FunctionExpression" || !expected) return;
+    const members = expected.kind === "union" ? expected.types : [expected];
+    const signatures = members.flatMap((m) => this.overloadsOf(this.expand(m)));
+    if (!signatures.length) return;
+    e.func.params.forEach((p, k) => {
+      if (p.typeAnnotation || p.pattern || p.default) return;
+      const candidates = [];
+      for (const signature of signatures) {
+        const t2 = signature.params[k]?.type ?? signature.varargs;
+        if (t2) candidates.push(t2);
+      }
+      if (!candidates.length) return;
+      const t = union(candidates);
+      this.contextualParams.set(p, containsTypeParam(t) ? anyType : t);
+    });
+  }
+  /** The parameter type each written argument lands on, across `fns`. */
+  expectedArguments(written, fns, selfOf) {
+    return written.map((_, j) => {
+      const candidates = [];
+      for (const f of fns) {
+        const i = j + selfOf(f);
+        const param = i < f.params.length ? this.boundParams(f)[i] : f.varargs;
+        if (param) candidates.push(param);
+      }
+      return candidates.length ? union(candidates) : void 0;
+    });
   }
   /** Synthesize a type from a destructuring pattern used without an
    *  annotation (`function f({ a, b = 1 })`). */
@@ -4752,7 +5081,8 @@ var TypeAnalyzer = class {
     f.params.forEach((p, i) => {
       const arg = argTypes[i];
       if (arg === void 0) return;
-      unify(p.type, keepsLiterals(p.type) ? arg : widen(arg), vars, subst);
+      const param = p.type.kind === "typeParam" && p.type.constraint ? { ...p.type, constraint: this.reduceType(p.type.constraint) } : p.type;
+      unify(p.type, keepsLiterals(param) ? arg : widen(arg), vars, subst);
     });
     for (const name of f.typeParams ?? []) if (!subst.has(name)) subst.set(name, unknownType);
     return subst;
@@ -4813,12 +5143,13 @@ var TypeAnalyzer = class {
         return;
       }
       const t = value;
+      if (t.kind === "object" && t.class) return;
       if (t.kind === "typeParam" && typeof t.name === "string" && bounds.has(t.name) && t.constraint && !containsTypeParam(t.constraint)) {
         bounds.set(t.name, this.reduceType(t.constraint));
       }
       for (const child of Object.values(value)) walk(child);
     };
-    for (const p of f.params) walk(p.type);
+    for (const p of f.params) if (containsTypeParam(p.type)) walk(p.type);
     return f.params.map((p) => substitute(p.type, bounds));
   }
   /** Record what each written argument is expected to be — see
@@ -5157,7 +5488,7 @@ var TypeAnalyzer = class {
     this.expandCache.set(key, t);
     this.resolvingAliases.add(t.name);
     try {
-      const r = def.params.length ? this.instantiateAlias(def, t.typeArguments) : this.resolveType(def.node);
+      const r = def.params.length ? this.instantiateAlias(def, t.typeArguments) : this.resolveDef(def);
       const named = def.params.length === 0 && (r.kind === "object" || r.kind === "intersection") && !r.name ? { ...r, name: t.name } : r;
       this.expandCache.set(key, named);
       return named;
@@ -5280,9 +5611,9 @@ var TypeAnalyzer = class {
           case "not":
             return booleanType;
           case "-":
-            return numberType;
+            return this.operatorResult(expr, "-", arg, void 0) ?? numberType;
           case "#":
-            return numberType;
+            return this.operatorResult(expr, "#", arg, void 0) ?? numberType;
         }
         return arg;
       }
@@ -5304,7 +5635,7 @@ var TypeAnalyzer = class {
         const r = this.infer(expr.right, env);
         switch (op) {
           case "..":
-            return stringType;
+            return this.operatorResult(expr, op, l, r) ?? stringType;
           case "==":
           case "~=":
           case "<":
@@ -5319,7 +5650,7 @@ var TypeAnalyzer = class {
           case "//":
           case "%":
           case "^":
-            return numberType;
+            return this.operatorResult(expr, op, l, r) ?? numberType;
         }
         return union([l, r]);
       }
@@ -5338,8 +5669,10 @@ var TypeAnalyzer = class {
       }
       case "CallExpression": {
         const callee = this.infer(expr.callee, env);
-        const argTypes = expr.arguments.map((a) => this.infer(a, env));
         const fns = this.overloadsOf(callee);
+        const expected = this.expectedArguments(expr.arguments, fns, () => 0);
+        expr.arguments.forEach((a, i) => this.applyContext(a, expected[i]));
+        const argTypes = expr.arguments.map((a) => this.infer(a, env));
         if (fns.length) {
           this.recordExpected(expr.arguments, fns, () => 0);
           const arityFits = this.checkArity(expr, fns, argTypes.length, 0);
@@ -5354,8 +5687,10 @@ var TypeAnalyzer = class {
       }
       case "MethodCallExpression": {
         const objType = this.infer(expr.object, env);
-        const argTypes = expr.arguments.map((a) => this.infer(a, env));
         const fns = this.overloadsOf(this.propertyType(objType, expr.method.name));
+        const expected = this.expectedArguments(expr.arguments, fns, (f) => this.takesSelf(f) ? 1 : 0);
+        expr.arguments.forEach((a, i) => this.applyContext(a, expected[i]));
+        const argTypes = expr.arguments.map((a) => this.infer(a, env));
         if (fns.length) {
           const withSelf = (f) => this.takesSelf(f) ? [objType, ...argTypes] : argTypes;
           const selfOf = (f) => this.takesSelf(f) ? 1 : 0;
@@ -5747,6 +6082,35 @@ var TypeAnalyzer = class {
       this.selfType = saved;
     }
   }
+  /** What an operator on a value with metamethods gives: `a + b` calls
+   *  `__add` on `a`, or failing that on `b` with the operands swapped — the
+   *  order Luau tries them in. That is how `Vector3 + Vector3`, `CFrame *
+   *  Vector3` and `2 * vector` get their types from the declarations.
+   *  `undefined` when neither operand declares the metamethod; an operand
+   *  that declares it but accepts neither argument is reported. */
+  operatorResult(node, op, left, right) {
+    const name = right === void 0 ? op === "-" ? "__unm" : "__len" : METAMETHODS[op];
+    if (!name) return void 0;
+    const candidates = right === void 0 ? [[left, void 0]] : [[left, right], [right, left]];
+    let declared;
+    for (const [receiver, other] of candidates) {
+      const t = this.expand(receiver);
+      const method = t.kind === "object" ? t.properties.get(name) : void 0;
+      if (!method) continue;
+      declared ??= receiver;
+      const args = other === void 0 ? [receiver] : [receiver, other];
+      const picked = this.pickOverload(this.overloadsOf(method.type), args);
+      if (picked) return this.callReturn(picked, args);
+    }
+    if (declared && this.emitDiagnostics) {
+      this.diagnostics.push({
+        node,
+        message: right === void 0 ? `Operator '${op}' cannot be applied to type '${formatType(left)}'` : `Operator '${op}' cannot be applied to types '${formatType(left)}' and '${formatType(right)}'`
+      });
+      return anyType;
+    }
+    return void 0;
+  }
   /** Does this signature take the receiver as its first parameter?
    *
    *  Luau's `:` is sugar both ways: `function T:m(a)` declares
@@ -5823,22 +6187,366 @@ function briefType(t) {
   return formatType(t);
 }
 
-// src/lib/luau.ts
-import { readFileSync } from "fs";
-import { fileURLToPath } from "url";
-var luauDefsPath = fileURLToPath(new URL("./luau.d.luaut", import.meta.url));
-var luauDefs = readFileSync(luauDefsPath, "utf8");
-var luauLib = parse(luauDefs);
+// src/project/host.ts
+import { readFileSync, statSync } from "fs";
+var nodeHost = {
+  readFile(path) {
+    try {
+      return statSync(path).isFile() ? readFileSync(path, "utf8") : void 0;
+    } catch {
+      return void 0;
+    }
+  }
+};
+
+// src/project/config.ts
+import { dirname, join, resolve } from "path";
+var CONFIG_FILE_NAMES = ["luaut.config.json", "luaut.config.jsonc"];
+function findConfig(file, host = nodeHost) {
+  const searched = [];
+  let directory = dirname(resolve(file));
+  for (; ; ) {
+    const found = [];
+    for (const name of CONFIG_FILE_NAMES) {
+      const path = join(directory, name);
+      searched.push(path);
+      if (host.readFile(path) !== void 0) found.push(path);
+    }
+    if (found.length > 1) {
+      const message = `Only one luaut config may be in a folder, but both ${CONFIG_FILE_NAMES.join(" and ")} are in ${directory}`;
+      return { searched, problems: found.map((path) => ({ file: path, message, line: 1, column: 1 })) };
+    }
+    if (found.length === 1) {
+      const { config, problems } = loadConfig(found[0], host);
+      return { config, problems, searched };
+    }
+    const parent = dirname(directory);
+    if (parent === directory) return { searched, problems: [] };
+    directory = parent;
+  }
+}
+var OPTIONS = ["types", "paths", "baseUrl", "sourceMap"];
+function loadConfig(path, host = nodeHost) {
+  const file = resolve(path);
+  const source = host.readFile(file);
+  if (source === void 0) return { problems: [{ file, message: "Cannot read the config file" }] };
+  let raw;
+  try {
+    raw = JSON.parse(stripJsonComments(source));
+  } catch (error) {
+    const message = error.message;
+    return { problems: [{ file, message: `Invalid JSON: ${message}`, ...jsonErrorPosition(source, message) }] };
+  }
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
+    return { problems: [{ file, message: "The config must be a JSON object", line: 1, column: 1 }] };
+  }
+  const directory = dirname(file);
+  const options = raw;
+  const problems = [];
+  const at = (key) => keyPosition(source, key);
+  const problem = (key, message) => {
+    problems.push({ file, message, ...at(key) });
+  };
+  for (const key of Object.keys(options)) {
+    if (!OPTIONS.includes(key)) {
+      problem(key, `Unknown option '${key}'. Options are: ${OPTIONS.join(", ")}`);
+    }
+  }
+  let types = [];
+  if (options.types !== void 0) {
+    if (Array.isArray(options.types) && options.types.every((t) => typeof t === "string")) types = options.types;
+    else problem("types", `'types' must be an array of strings, such as ["luau"]`);
+  }
+  const paths = {};
+  if (options.paths !== void 0) {
+    const value = options.paths;
+    if (value && typeof value === "object" && !Array.isArray(value)) {
+      for (const [pattern, targets] of Object.entries(value)) {
+        if (Array.isArray(targets) && targets.every((t) => typeof t === "string")) paths[pattern] = targets;
+        else problem(pattern, `'paths' entry '${pattern}' must be an array of strings`);
+        if (pattern.split("*").length > 2) problem(pattern, `'paths' pattern '${pattern}' may contain at most one '*'`);
+      }
+    } else {
+      problem("paths", `'paths' must be an object, such as { "@shared/*": ["src/shared/*"] }`);
+    }
+  }
+  let baseUrl = directory;
+  if (options.baseUrl !== void 0) {
+    if (typeof options.baseUrl === "string") baseUrl = resolve(directory, options.baseUrl);
+    else problem("baseUrl", "'baseUrl' must be a string");
+  }
+  let sourceMap = null;
+  if (options.sourceMap !== void 0 && options.sourceMap !== null) {
+    if (typeof options.sourceMap === "string") sourceMap = resolve(directory, options.sourceMap);
+    else problem("sourceMap", "'sourceMap' must be a path string, or null for none");
+  }
+  return { config: { path: file, directory, source, types, paths, baseUrl, sourceMap }, problems };
+}
+function stripJsonComments(text) {
+  const out = text.split("");
+  let i = 0;
+  let inString = false;
+  while (i < text.length) {
+    const ch = text[i];
+    if (inString) {
+      if (ch === "\\") i += 2;
+      else {
+        if (ch === '"') inString = false;
+        i++;
+      }
+      continue;
+    }
+    if (ch === '"') {
+      inString = true;
+      i++;
+    } else if (ch === "/" && text[i + 1] === "/") {
+      while (i < text.length && text[i] !== "\n") out[i++] = " ";
+    } else if (ch === "/" && text[i + 1] === "*") {
+      out[i++] = " ";
+      out[i++] = " ";
+      while (i < text.length && !(text[i] === "*" && text[i + 1] === "/")) {
+        if (text[i] !== "\n") out[i] = " ";
+        i++;
+      }
+      if (i < text.length) {
+        out[i++] = " ";
+        out[i++] = " ";
+      }
+    } else if (ch === ",") {
+      let j = i + 1;
+      while (j < text.length && /\s/.test(text[j])) j++;
+      if (text[j] === "}" || text[j] === "]") out[i] = " ";
+      i++;
+    } else {
+      i++;
+    }
+  }
+  return out.join("");
+}
+function jsonErrorPosition(source, message) {
+  const lineColumn = /line (\d+) column (\d+)/.exec(message);
+  if (lineColumn) return { line: Number(lineColumn[1]), column: Number(lineColumn[2]) };
+  const position = /position (\d+)/.exec(message);
+  return position ? offsetPosition(source, Number(position[1])) : { line: 1, column: 1 };
+}
+function keyPosition(source, key) {
+  const offset = source.indexOf(JSON.stringify(key));
+  return offset < 0 ? { line: 1, column: 1 } : offsetPosition(source, offset);
+}
+function offsetPosition(source, offset) {
+  const before = source.slice(0, offset);
+  const line = before.split("\n").length;
+  return { line, column: offset - before.lastIndexOf("\n") };
+}
+
+// src/project/libraries.ts
+import { dirname as dirname2, join as join2, resolve as resolve2 } from "path";
+function resolveTypeLibraries(config, host = nodeHost) {
+  const files = [];
+  const problems = [];
+  const loaded = /* @__PURE__ */ new Set();
+  const addFile = (file) => {
+    const key = pathKey(file);
+    if (loaded.has(key)) return;
+    loaded.add(key);
+    files.push(file);
+  };
+  const addPackage = (directory, entryFile, visiting) => {
+    const key = pathKey(directory);
+    if (visiting.has(key)) return;
+    visiting.add(key);
+    for (const dependency of dependencyNames(directory, host)) {
+      const found = findPackage(dependency, directory, host);
+      if (found) addPackage(found.directory, found.file, visiting);
+    }
+    addFile(entryFile);
+  };
+  for (const entry of config.types) {
+    const relative = entry.startsWith("./") || entry.startsWith("../") || entry.startsWith("/") || /^[A-Za-z]:[\\/]/.test(entry);
+    if (relative) {
+      const target = resolve2(config.directory, entry);
+      if (entry.endsWith(".luaut")) {
+        if (host.readFile(target) !== void 0) addFile(target);
+        else problems.push({ file: config.path, message: `Cannot find type library file '${entry}'`, ...entryPosition(config, entry) });
+        continue;
+      }
+      const file = packageEntry(target, host);
+      if (file) addPackage(target, file, /* @__PURE__ */ new Set());
+      else problems.push({ file: config.path, message: `'${entry}' has no ${ENTRY_FILE} (or 'luaut.types' in its package.json)`, ...entryPosition(config, entry) });
+      continue;
+    }
+    const names = entry.startsWith("@") || entry.includes("/") ? [entry] : [`@luaut/${entry}`, entry];
+    const found = names.map((name) => findPackage(name, config.directory, host)).find(Boolean);
+    if (found) addPackage(found.directory, found.file, /* @__PURE__ */ new Set());
+    else {
+      problems.push({
+        file: config.path,
+        message: `Cannot find type library '${entry}'. Install it with: npm i -D ${names[0]}`,
+        ...entryPosition(config, entry)
+      });
+    }
+  }
+  return { files, problems };
+}
+var ENTRY_FILE = "index.d.luaut";
+function packageEntry(directory, host) {
+  const manifest = readJson(join2(directory, "package.json"), host);
+  const declared = manifest?.luaut?.types;
+  const file = resolve2(directory, typeof declared === "string" ? declared : ENTRY_FILE);
+  return host.readFile(file) !== void 0 ? file : void 0;
+}
+function findPackage(name, from, host) {
+  let directory = resolve2(from);
+  for (; ; ) {
+    const candidate = join2(directory, "node_modules", ...name.split("/"));
+    const file = packageEntry(candidate, host);
+    if (file) return { directory: candidate, file };
+    const parent = dirname2(directory);
+    if (parent === directory) return void 0;
+    directory = parent;
+  }
+}
+function dependencyNames(directory, host) {
+  const manifest = readJson(join2(directory, "package.json"), host);
+  const names = /* @__PURE__ */ new Set();
+  for (const field of ["dependencies", "peerDependencies"]) {
+    const deps = manifest?.[field];
+    if (deps && typeof deps === "object") for (const name of Object.keys(deps)) names.add(name);
+  }
+  return [...names];
+}
+function readJson(path, host) {
+  const text = host.readFile(path);
+  if (text === void 0) return void 0;
+  try {
+    const value = JSON.parse(text);
+    return value && typeof value === "object" ? value : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function entryPosition(config, entry) {
+  return keyPosition(config.source, entry);
+}
+function pathKey(path) {
+  const normalized = resolve2(path);
+  return process.platform === "win32" ? normalized.toLowerCase() : normalized;
+}
+
+// src/project/modules.ts
+import { dirname as dirname3, join as join3, resolve as resolve3 } from "path";
+function moduleCandidates(fromFile, specifier, config) {
+  const bases = specifier.startsWith("./") || specifier.startsWith("../") ? [resolve3(dirname3(fromFile), specifier)] : config ? aliasTargets(config, specifier) : [];
+  return bases.flatMap((base) => base.endsWith(".luaut") ? [base] : [`${base}.luaut`, `${base}.d.luaut`, join3(base, "index.luaut")]);
+}
+function resolveModulePath(fromFile, specifier, config, host = nodeHost) {
+  return moduleCandidates(fromFile, specifier, config).find((path) => host.readFile(path) !== void 0);
+}
+function aliasTargets(config, specifier) {
+  let match;
+  let prefixLength = -1;
+  for (const pattern2 of Object.keys(config.paths)) {
+    const star = pattern2.indexOf("*");
+    if (star < 0) {
+      if (pattern2 === specifier) {
+        match = { pattern: pattern2, wildcard: "" };
+        break;
+      }
+      continue;
+    }
+    const prefix = pattern2.slice(0, star);
+    const suffix = pattern2.slice(star + 1);
+    const fits = specifier.length >= prefix.length + suffix.length && specifier.startsWith(prefix) && specifier.endsWith(suffix);
+    if (fits && prefix.length > prefixLength) {
+      prefixLength = prefix.length;
+      match = { pattern: pattern2, wildcard: specifier.slice(prefix.length, specifier.length - suffix.length) };
+    }
+  }
+  if (!match) return [];
+  const { pattern, wildcard } = match;
+  return config.paths[pattern].map((target) => resolve3(config.baseUrl, target.replace("*", wildcard)));
+}
 
-// src/lib/roblox.ts
-import { readFileSync as readFileSync2 } from "fs";
-import { fileURLToPath as fileURLToPath2 } from "url";
-var robloxDefsPath = fileURLToPath2(new URL("./roblox.d.luaut", import.meta.url));
-var robloxDefs = readFileSync2(robloxDefsPath, "utf8");
-var robloxLib = parse(robloxDefs);
+// src/project/sourcemap.ts
+import { dirname as dirname4, extname, resolve as resolve4 } from "path";
+var IDENTIFIER = /^[A-Za-z_][A-Za-z0-9_]*$/;
+var INSTANCE_MEMBERS = /* @__PURE__ */ new Set(["Name", "ClassName", "Parent", "Archivable"]);
+var SCRIPT_EXTENSIONS = /* @__PURE__ */ new Set([".luaut", ".luau", ".lua"]);
+function sourceMapTypes(text, path, options) {
+  let root;
+  try {
+    root = JSON.parse(text);
+  } catch (error) {
+    return { problem: `Invalid sourcemap: ${error.message}` };
+  }
+  if (!isNode(root)) return { problem: "Invalid sourcemap: the root must be an object with 'name' and 'className'" };
+  const directory = dirname4(resolve4(path));
+  const lines = [];
+  const aliasOfFile = /* @__PURE__ */ new Map();
+  const used = /* @__PURE__ */ new Set();
+  const aliasOfNode = /* @__PURE__ */ new Map();
+  const aliasFor = (segments) => {
+    const base = `SourceMap_${segments.map((s) => s.replace(/[^A-Za-z0-9_]/g, "_")).join("_")}`;
+    let alias = base;
+    for (let n = 2; used.has(alias); n++) alias = `${base}_${n}`;
+    used.add(alias);
+    return alias;
+  };
+  const visit = (node, segments, parent) => {
+    const alias = aliasFor(segments);
+    aliasOfNode.set(node, alias);
+    for (const filePath of node.filePaths ?? []) aliasOfFile.set(fileKey(resolve4(directory, filePath)), alias);
+    const className = IDENTIFIER.test(node.className) && options.classes.has(node.className) ? node.className : "Instance";
+    const taken = options.membersOf?.(className) ?? INSTANCE_MEMBERS;
+    const members = [];
+    if (parent) members.push(`Parent: ${parent}`);
+    const named = /* @__PURE__ */ new Set();
+    for (const child of node.children ?? []) {
+      if (!isNode(child)) continue;
+      const childAlias = visit(child, [...segments, child.name], alias);
+      if (!IDENTIFIER.test(child.name) || taken.has(child.name) || named.has(child.name)) continue;
+      named.add(child.name);
+      members.push(`${child.name}: ${childAlias}`);
+    }
+    lines.push(`declare class ${alias} extends ${className} { ${members.join(", ")} }`);
+    return alias;
+  };
+  const rootAlias = visit(root, [root.name], void 0);
+  if (root.className === "DataModel") {
+    lines.push(`declare game: ${rootAlias}`);
+    const workspace = (root.children ?? []).find((child) => isNode(child) && child.className === "Workspace");
+    const workspaceAlias = workspace && aliasOfNode.get(workspace);
+    if (workspaceAlias) lines.push(`declare workspace: ${workspaceAlias}`);
+  }
+  let program;
+  try {
+    program = parse(lines.join("\n"));
+  } catch (error) {
+    return { problem: `Could not turn the sourcemap into types: ${error.message}` };
+  }
+  return {
+    types: {
+      program,
+      scriptFor(file) {
+        const alias = aliasOfFile.get(fileKey(file));
+        return alias ? parse(`declare script: ${alias}`) : void 0;
+      }
+    }
+  };
+}
+function isNode(value) {
+  if (!value || typeof value !== "object") return false;
+  const node = value;
+  return typeof node.name === "string" && typeof node.className === "string";
+}
+function fileKey(path) {
+  const extension = extname(path);
+  const bare = SCRIPT_EXTENSIONS.has(extension) ? path.slice(0, -extension.length) : path;
+  const normalized = resolve4(bare);
+  return process.platform === "win32" ? normalized.toLowerCase() : normalized;
+}
 
 // src/index.ts
-var defaultLibs = [luauLib, robloxLib];
 var luautparser = {
   tokenize,
   parseTokens,
@@ -5854,6 +6562,7 @@ var luautparser = {
 var index_default = luautparser;
 export {
   BinaryOperators,
+  CONFIG_FILE_NAMES,
   Keywords,
   LexError,
   Operators,
@@ -5868,25 +6577,25 @@ export {
   bufferType,
   containsTypeParam,
   index_default as default,
-  defaultLibs,
   difference,
   equalTypes,
   falsyType,
+  findConfig,
   fn,
   formatType,
   getBinding,
   intersection,
   isAssignable,
+  isClassType,
   isGlobal,
   isPossiblyFalsy,
   isPossiblyTruthy,
   isUnassignedGlobal,
   literal,
-  luauDefs,
-  luauDefsPath,
-  luauLib,
+  loadConfig,
   luautparser,
   matchInfer,
+  moduleCandidates,
   moduleExports,
   narrowExclude,
   narrowFalsy,
@@ -5894,6 +6603,7 @@ export {
   narrowTruthy,
   neverType,
   nilType,
+  nodeHost,
   numberType,
   objectType,
   optional,
@@ -5903,11 +6613,12 @@ export {
   parseTokens,
   parseWithRecovery,
   primitive,
-  robloxDefs,
-  robloxDefsPath,
-  robloxLib,
+  resolveModulePath,
+  resolveTypeLibraries,
   setAliasExpander,
+  sourceMapTypes,
   stringType,
+  stripJsonComments,
   substitute,
   templateMatches,
   threadType,