@tilua/compiler 9.1.2 → 9.1.3

package/README.md

@@ -546,12 +546,12 @@ a script that requires any of them knows what it got.
 <!-- compatibility:start -->
 ## Compatibility
 
-`@tilua/compiler@9.1.2` works with these tilua packages. *Released with* is the
+`@tilua/compiler@9.1.3` works with these tilua packages. *Released with* is the
 version it was built and tested against.
 
 | Package | Range | Released with | |
 | --- | --- | --- | --- |
-| `@tilua/parser` | `^9.1.2` | 9.1.2 | dependency |
+| `@tilua/parser` | `^9.1.3` | 9.1.3 | dependency |
 <!-- compatibility:end -->
 
 ## Development

package/dist/{chunk-NS6CK5FX.js → chunk-YWRP7SXR.js}

@@ -2817,6 +2817,8 @@ import {
   analyzeScopes,
   analyzeTypes,
   moduleExports,
+  classesOf,
+  exportsFingerprint,
   resolveModulePath,
   resolveTypeLibraries,
   importExpressions,
@@ -4183,6 +4185,7 @@ function parsedLibrary(file) {
   return program2;
 }
 var moduleAnalyses = /* @__PURE__ */ new Map();
+var MAX_CYCLE_PASSES = 6;
 function analyzeModules(modules, config) {
   const out = [];
   const analyses = /* @__PURE__ */ new Map();
@@ -4201,12 +4204,14 @@ function analyzeModules(modules, config) {
   const inProgress = /* @__PURE__ */ new Set();
   const analyzed = /* @__PURE__ */ new Map();
   let partials = 0;
+  const cycles = /* @__PURE__ */ new Set();
+  const provisional = /* @__PURE__ */ new Map();
   const readWhile = /* @__PURE__ */ new Map();
   const settingFor = `${libraries.files.join("|")}#${config?.directory ?? ""}#${JSON.stringify(config?.paths ?? {})}`;
   const analyzeModule = (file, program2) => {
     const done = analyzed.get(file);
     if (done) return done;
-    const remembered = moduleAnalyses.get(file);
+    const remembered = cycles.size ? void 0 : moduleAnalyses.get(file);
     const script = scriptOf(file);
     const ownLibs = script ? [...libs, script] : libs;
     if (remembered && remembered.setting === settingFor && ownLibs.length === remembered.libs.length && remembered.libs.every((lib, i) => lib === ownLibs[i]) && remembered.program === program2 && [...remembered.read].every(([read3, stamp]) => stampOf(read3) === stamp)) {
@@ -4234,6 +4239,8 @@ function analyzeModules(modules, config) {
     const result2 = { types, diagnostics: said, scopes };
     if (partials === before) {
       analyzed.set(file, result2);
+    }
+    if (partials === before && !cycles.size) {
       const read3 = readWhile.get(file) ?? /* @__PURE__ */ new Map();
       const own = stampOf(file);
       if (own !== void 0) read3.set(file, own);
@@ -4256,7 +4263,8 @@ function analyzeModules(modules, config) {
     };
     if (inProgress.has(target)) {
       partials++;
-      return { values: /* @__PURE__ */ new Map(), types: /* @__PURE__ */ new Map(), partial: true };
+      cycles.add(target);
+      return provisional.get(target) ?? { values: /* @__PURE__ */ new Map(), types: /* @__PURE__ */ new Map(), partial: true };
     }
     const cached = exportsCache.get(target);
     if (cached) {
@@ -4283,11 +4291,6 @@ function analyzeModules(modules, config) {
       inProgress.delete(target);
     }
   };
-  for (const module of modules) {
-    const { types, diagnostics } = analyzeModule(module.file, module.program);
-    analyses.set(module.file, types);
-    out.push(...diagnostics);
-  }
   const exportsOf = (file) => {
     const cached = exportsCache.get(file);
     if (cached) return cached;
@@ -4297,6 +4300,30 @@ function analyzeModules(modules, config) {
     exportsCache.set(file, exports);
     return exports;
   };
+  const reported = out.length;
+  const libraryClasses = classesOf(libs);
+  const fingerprints = /* @__PURE__ */ new Map();
+  for (let pass = 1; ; pass++) {
+    out.length = reported;
+    for (const module of modules) {
+      const { types, diagnostics } = analyzeModule(module.file, module.program);
+      analyses.set(module.file, types);
+      out.push(...diagnostics);
+    }
+    if (!cycles.size || pass === MAX_CYCLE_PASSES) break;
+    let settled = pass > 1;
+    for (const file of cycles) {
+      const exports = byFile.has(file) ? exportsOf(file) : exportsCache.get(file);
+      if (exports && !exports.partial) provisional.set(file, exports);
+      const fingerprint = exports && !exports.partial ? exportsFingerprint(exports, libraryClasses) : void 0;
+      if (fingerprint === void 0 || fingerprint !== fingerprints.get(file)) settled = false;
+      fingerprints.set(file, fingerprint);
+    }
+    if (settled) break;
+    analyzed.clear();
+    exportsCache.clear();
+    readWhile.clear();
+  }
   return { types: analyses, diagnostics: out, lowerings: [...libraries.lowerings], exportsOf };
 }
 function allStatements(statements) {

package/dist/cli.cjs

@@ -4176,6 +4176,7 @@ function parsedLibrary(file) {
   return program2;
 }
 var moduleAnalyses = /* @__PURE__ */ new Map();
+var MAX_CYCLE_PASSES = 6;
 function analyzeModules(modules, config2) {
   const out2 = [];
   const analyses = /* @__PURE__ */ new Map();
@@ -4194,12 +4195,14 @@ function analyzeModules(modules, config2) {
   const inProgress = /* @__PURE__ */ new Set();
   const analyzed = /* @__PURE__ */ new Map();
   let partials = 0;
+  const cycles = /* @__PURE__ */ new Set();
+  const provisional = /* @__PURE__ */ new Map();
   const readWhile = /* @__PURE__ */ new Map();
   const settingFor = `${libraries.files.join("|")}#${config2?.directory ?? ""}#${JSON.stringify(config2?.paths ?? {})}`;
   const analyzeModule = (file, program2) => {
     const done = analyzed.get(file);
     if (done) return done;
-    const remembered = moduleAnalyses.get(file);
+    const remembered = cycles.size ? void 0 : moduleAnalyses.get(file);
     const script = scriptOf(file);
     const ownLibs = script ? [...libs, script] : libs;
     if (remembered && remembered.setting === settingFor && ownLibs.length === remembered.libs.length && remembered.libs.every((lib, i) => lib === ownLibs[i]) && remembered.program === program2 && [...remembered.read].every(([read3, stamp]) => stampOf(read3) === stamp)) {
@@ -4227,6 +4230,8 @@ function analyzeModules(modules, config2) {
     const result2 = { types, diagnostics: said, scopes };
     if (partials === before) {
       analyzed.set(file, result2);
+    }
+    if (partials === before && !cycles.size) {
       const read3 = readWhile.get(file) ?? /* @__PURE__ */ new Map();
       const own = stampOf(file);
       if (own !== void 0) read3.set(file, own);
@@ -4249,7 +4254,8 @@ function analyzeModules(modules, config2) {
     };
     if (inProgress.has(target)) {
       partials++;
-      return { values: /* @__PURE__ */ new Map(), types: /* @__PURE__ */ new Map(), partial: true };
+      cycles.add(target);
+      return provisional.get(target) ?? { values: /* @__PURE__ */ new Map(), types: /* @__PURE__ */ new Map(), partial: true };
     }
     const cached = exportsCache.get(target);
     if (cached) {
@@ -4276,11 +4282,6 @@ function analyzeModules(modules, config2) {
       inProgress.delete(target);
     }
   };
-  for (const module2 of modules) {
-    const { types, diagnostics } = analyzeModule(module2.file, module2.program);
-    analyses.set(module2.file, types);
-    out2.push(...diagnostics);
-  }
   const exportsOf = (file) => {
     const cached = exportsCache.get(file);
     if (cached) return cached;
@@ -4290,6 +4291,30 @@ function analyzeModules(modules, config2) {
     exportsCache.set(file, exports2);
     return exports2;
   };
+  const reported = out2.length;
+  const libraryClasses = (0, import_parser7.classesOf)(libs);
+  const fingerprints = /* @__PURE__ */ new Map();
+  for (let pass = 1; ; pass++) {
+    out2.length = reported;
+    for (const module2 of modules) {
+      const { types, diagnostics } = analyzeModule(module2.file, module2.program);
+      analyses.set(module2.file, types);
+      out2.push(...diagnostics);
+    }
+    if (!cycles.size || pass === MAX_CYCLE_PASSES) break;
+    let settled = pass > 1;
+    for (const file of cycles) {
+      const exports2 = byFile.has(file) ? exportsOf(file) : exportsCache.get(file);
+      if (exports2 && !exports2.partial) provisional.set(file, exports2);
+      const fingerprint = exports2 && !exports2.partial ? (0, import_parser7.exportsFingerprint)(exports2, libraryClasses) : void 0;
+      if (fingerprint === void 0 || fingerprint !== fingerprints.get(file)) settled = false;
+      fingerprints.set(file, fingerprint);
+    }
+    if (settled) break;
+    analyzed.clear();
+    exportsCache.clear();
+    readWhile.clear();
+  }
   return { types: analyses, diagnostics: out2, lowerings: [...libraries.lowerings], exportsOf };
 }
 function allStatements(statements) {

package/dist/cli.js

@@ -3,7 +3,7 @@ import {
   WRITTEN_BY_TILUA,
   bundle,
   resolveConfig
-} from "./chunk-NS6CK5FX.js";
+} from "./chunk-YWRP7SXR.js";
 
 // src/cli.ts
 import { copyFileSync, existsSync, mkdirSync, readdirSync, readFileSync, rmdirSync, rmSync, watch, writeFileSync } from "fs";

package/dist/index.cjs

@@ -4200,6 +4200,7 @@ function parsedLibrary(file) {
   return program2;
 }
 var moduleAnalyses = /* @__PURE__ */ new Map();
+var MAX_CYCLE_PASSES = 6;
 function analyzeModules(modules, config) {
   const out = [];
   const analyses = /* @__PURE__ */ new Map();
@@ -4218,12 +4219,14 @@ function analyzeModules(modules, config) {
   const inProgress = /* @__PURE__ */ new Set();
   const analyzed = /* @__PURE__ */ new Map();
   let partials = 0;
+  const cycles = /* @__PURE__ */ new Set();
+  const provisional = /* @__PURE__ */ new Map();
   const readWhile = /* @__PURE__ */ new Map();
   const settingFor = `${libraries.files.join("|")}#${config?.directory ?? ""}#${JSON.stringify(config?.paths ?? {})}`;
   const analyzeModule = (file, program2) => {
     const done = analyzed.get(file);
     if (done) return done;
-    const remembered = moduleAnalyses.get(file);
+    const remembered = cycles.size ? void 0 : moduleAnalyses.get(file);
     const script = scriptOf(file);
     const ownLibs = script ? [...libs, script] : libs;
     if (remembered && remembered.setting === settingFor && ownLibs.length === remembered.libs.length && remembered.libs.every((lib, i) => lib === ownLibs[i]) && remembered.program === program2 && [...remembered.read].every(([read3, stamp]) => stampOf(read3) === stamp)) {
@@ -4251,6 +4254,8 @@ function analyzeModules(modules, config) {
     const result2 = { types, diagnostics: said, scopes };
     if (partials === before) {
       analyzed.set(file, result2);
+    }
+    if (partials === before && !cycles.size) {
       const read3 = readWhile.get(file) ?? /* @__PURE__ */ new Map();
       const own = stampOf(file);
       if (own !== void 0) read3.set(file, own);
@@ -4273,7 +4278,8 @@ function analyzeModules(modules, config) {
     };
     if (inProgress.has(target)) {
       partials++;
-      return { values: /* @__PURE__ */ new Map(), types: /* @__PURE__ */ new Map(), partial: true };
+      cycles.add(target);
+      return provisional.get(target) ?? { values: /* @__PURE__ */ new Map(), types: /* @__PURE__ */ new Map(), partial: true };
     }
     const cached = exportsCache.get(target);
     if (cached) {
@@ -4300,11 +4306,6 @@ function analyzeModules(modules, config) {
       inProgress.delete(target);
     }
   };
-  for (const module2 of modules) {
-    const { types, diagnostics } = analyzeModule(module2.file, module2.program);
-    analyses.set(module2.file, types);
-    out.push(...diagnostics);
-  }
   const exportsOf = (file) => {
     const cached = exportsCache.get(file);
     if (cached) return cached;
@@ -4314,6 +4315,30 @@ function analyzeModules(modules, config) {
     exportsCache.set(file, exports2);
     return exports2;
   };
+  const reported = out.length;
+  const libraryClasses = (0, import_parser7.classesOf)(libs);
+  const fingerprints = /* @__PURE__ */ new Map();
+  for (let pass = 1; ; pass++) {
+    out.length = reported;
+    for (const module2 of modules) {
+      const { types, diagnostics } = analyzeModule(module2.file, module2.program);
+      analyses.set(module2.file, types);
+      out.push(...diagnostics);
+    }
+    if (!cycles.size || pass === MAX_CYCLE_PASSES) break;
+    let settled = pass > 1;
+    for (const file of cycles) {
+      const exports2 = byFile.has(file) ? exportsOf(file) : exportsCache.get(file);
+      if (exports2 && !exports2.partial) provisional.set(file, exports2);
+      const fingerprint = exports2 && !exports2.partial ? (0, import_parser7.exportsFingerprint)(exports2, libraryClasses) : void 0;
+      if (fingerprint === void 0 || fingerprint !== fingerprints.get(file)) settled = false;
+      fingerprints.set(file, fingerprint);
+    }
+    if (settled) break;
+    analyzed.clear();
+    exportsCache.clear();
+    readWhile.clear();
+  }
   return { types: analyses, diagnostics: out, lowerings: [...libraries.lowerings], exportsOf };
 }
 function allStatements(statements) {

package/dist/index.js

@@ -8,7 +8,7 @@ import {
   program,
   resolveConfig,
   syntaxOf
-} from "./chunk-NS6CK5FX.js";
+} from "./chunk-YWRP7SXR.js";
 
 // src/compile.ts
 import { readFileSync } from "fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tilua/compiler",
-  "version": "9.1.2",
+  "version": "9.1.3",
   "description": "Compiles tilua to Luau: lowers the @tilua/parser AST to a luau-parser AST and prints it",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -37,7 +37,7 @@
   "license": "ISC",
   "type": "module",
   "dependencies": {
-    "@tilua/parser": "^9.1.2",
+    "@tilua/parser": "^9.1.3",
     "luau-parser": "^1.1.0"
   },
   "devDependencies": {