@fluixi/compiler 1.0.0-alpha.90 → 1.0.0-alpha.92

package/dist/resolve/write-globals.cjs

@@ -21,6 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var write_globals_exports = {};
 __export(write_globals_exports, {
   DEFAULT_GLOBALS_PATH: () => DEFAULT_GLOBALS_PATH,
+  patternCandidates: () => patternCandidates,
   writeComponentGlobals: () => writeComponentGlobals
 });
 module.exports = __toCommonJS(write_globals_exports);
@@ -136,7 +137,9 @@ var INTRINSICS = {
   // does. `untrack` suppresses dependency collection, which is exactly the kind of thing
   // dependency analysis must not guess at.
   $untrack: { export: "untrack", module: REACTIVE_MODULE, returns: "plain" },
-  $untrackStore: { export: "untrackStore", module: "@fluixi/reactive/store", returns: "plain" }
+  $untrackStore: { export: "untrackStore", module: "@fluixi/reactive/store", returns: "plain" },
+  // An environment variable, public or server-only; the browser build refuses a secret.
+  $env: { export: "env", module: "@fluixi/start/env", returns: "plain" }
 };
 var INTRINSIC_CALL = new RegExp(`\\$(?:${Object.keys(INTRINSICS).map((n) => n.slice(1)).join("|")})\\s*\\(`);
 
@@ -178,7 +181,8 @@ function componentGlobals(rules, options = {}) {
     builtins = true,
     intrinsics = true,
     generator = "@fluixi/compiler",
-    specifier = (module2) => module2
+    specifier = (module2) => module2,
+    candidates = []
   } = options;
   const all = [...rules];
   if (builtins) {
@@ -190,7 +194,8 @@ function componentGlobals(rules, options = {}) {
   const shadowedByDom = [];
   const unavailable = [];
   const resolved = /* @__PURE__ */ new Map();
-  for (const name of [...resolver.names()].sort()) {
+  const names = /* @__PURE__ */ new Set([...resolver.names(), ...[...candidates].filter((n) => /^[A-Za-z_$][\w$]*$/.test(n))]);
+  for (const name of [...names].sort()) {
     const target = resolver.resolve(name);
     if (!target) continue;
     const pkg = packageOf(target.module);
@@ -201,7 +206,11 @@ function componentGlobals(rules, options = {}) {
       resolved.set(name, target);
     }
   }
-  const intrinsicModules = intrinsics ? [...new Set(Object.values(INTRINSICS).map((i) => i.module))] : [];
+  const usableIntrinsics = intrinsics ? Object.entries(INTRINSICS).filter(([, i]) => {
+    const pkg = packageOf(i.module);
+    return !available || !pkg || available.has(pkg);
+  }) : [];
+  const intrinsicModules = [...new Set(usableIntrinsics.map(([, i]) => i.module))];
   const modules = [
     .../* @__PURE__ */ new Set([...declared.map((name) => resolved.get(name).module), ...intrinsicModules])
   ].sort();
@@ -221,15 +230,18 @@ function componentGlobals(rules, options = {}) {
     return `//   import { ${n} } from '${module2 ? specifier(module2) : ""}';
 `;
   }).join("") : "";
-  const intrinsicLines = intrinsics ? Object.entries(INTRINSICS).map(
+  const intrinsicLines = usableIntrinsics.map(
     ([name, intrinsic]) => `  const ${name}: typeof ${namespaceAlias(intrinsic.module)}.${intrinsic.export};`
-  ) : [];
+  );
   const patternRules = rules.filter((rule) => "match" in rule).length;
-  const patternNote = patternRules > 0 ? `//
+  const patternNote = patternRules === 0 ? "" : options.candidates ? `//
+// ${patternRules} pattern rule${patternRules === 1 ? "" : "s"}: declared for the files the module path
+// points at. A name with no such file still resolves at build time; declare it by hand.
+` : `//
 // ${patternRules} pattern rule${patternRules === 1 ? "" : "s"} cannot be declared:
 // a pattern matches unboundedly many names, so there is no list to emit. Those
 // tags still resolve at build time; declare them by hand if the editor needs them.
-` : "";
+`;
   const source = `// GENERATED by ${generator}, do not edit.
 //
 // The components \`resolve\` supplies without an import. This describes what the
@@ -286,6 +298,30 @@ function projectDependencies(root) {
     return void 0;
   }
 }
+function patternCandidates(rules, root) {
+  const out = [];
+  for (const rule of rules) {
+    if (!("match" in rule) || !rule.module.startsWith("/")) continue;
+    const dir = (0, import_node_path.dirname)(rule.module);
+    const file = (0, import_node_path.basename)(rule.module);
+    const group = file.match(/\$\d+/);
+    if (dir.includes("$") || !group || file.indexOf("$", group.index + 1) !== -1) continue;
+    const before = file.slice(0, group.index);
+    const after = file.slice(group.index + group[0].length);
+    let entries;
+    try {
+      entries = (0, import_node_fs.readdirSync)((0, import_node_path.resolve)(root, dir.slice(1)));
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      if (entry.length > before.length + after.length && entry.startsWith(before) && entry.endsWith(after)) {
+        out.push(entry.slice(before.length, entry.length - after.length));
+      }
+    }
+  }
+  return out;
+}
 function writeComponentGlobals(options, root) {
   if (options.globals === false) return { status: "skipped", reason: "disabled" };
   const rules = options.resolve ?? [];
@@ -301,6 +337,7 @@ function writeComponentGlobals(options, root) {
   }
   const { source, declared } = componentGlobals(rules, {
     available: projectDependencies(root),
+    candidates: patternCandidates(rules, root),
     specifier: (module2) => forTypeScript(module2, (0, import_node_path.dirname)(target), root)
   });
   if (existing === source) {

package/dist/resolve/write-globals.d.cts

@@ -26,5 +26,11 @@ export type WriteGlobalsOutcome = ({
      */
     warning?: string;
 };
+/**
+ * Names from the files a pattern rule points at: `/src/components/$1.tsx` lists
+ * `src/components` and offers each `X` for `X.tsx`. Only a project path with the group in
+ * the file name; the resolver still decides whether a name matches.
+ */
+export declare function patternCandidates(rules: readonly ComponentResolverRule[], root: string): string[];
 /** Generate and write the declarations for `root`, returning what was done. */
 export declare function writeComponentGlobals(options: WriteGlobalsOptions, root: string): WriteGlobalsOutcome;

package/dist/resolve/write-globals.d.ts

@@ -26,6 +26,12 @@ export type WriteGlobalsOutcome = ({
      */
     warning?: string;
 };
+/**
+ * Names from the files a pattern rule points at: `/src/components/$1.tsx` lists
+ * `src/components` and offers each `X` for `X.tsx`. Only a project path with the group in
+ * the file name; the resolver still decides whether a name matches.
+ */
+export declare function patternCandidates(rules: readonly ComponentResolverRule[], root: string): string[];
 /** Generate and write the declarations for `root`, returning what was done. */
 export declare function writeComponentGlobals(options: WriteGlobalsOptions, root: string): WriteGlobalsOutcome;
 //# sourceMappingURL=write-globals.d.ts.map

package/dist/resolve/write-globals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write-globals.d.ts","sourceRoot":"","sources":["../../src/resolve/write-globals.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAKrE,eAAO,MAAM,oBAAoB,gBAAgB,CAAC;AAElD,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,SAAS,qBAAqB,EAAE,CAAC;IAC3C,OAAO,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CAC1B;AAED,MAAM,MAAM,mBAAmB,GAAG,CAC9B;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACrD;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACvD;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,UAAU,GAAG,cAAc,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAC5E,GAAG;IACF;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AA2EF,+EAA+E;AAC/E,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,mBAAmB,EAC5B,IAAI,EAAE,MAAM,GACX,mBAAmB,CAwCrB"}
+{"version":3,"file":"write-globals.d.ts","sourceRoot":"","sources":["../../src/resolve/write-globals.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAKrE,eAAO,MAAM,oBAAoB,gBAAgB,CAAC;AAElD,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,SAAS,qBAAqB,EAAE,CAAC;IAC3C,OAAO,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CAC1B;AAED,MAAM,MAAM,mBAAmB,GAAG,CAC9B;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACrD;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACvD;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,UAAU,GAAG,cAAc,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAC5E,GAAG;IACF;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AA2EF;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,SAAS,qBAAqB,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAuBjG;AAED,+EAA+E;AAC/E,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,mBAAmB,EAC5B,IAAI,EAAE,MAAM,GACX,mBAAmB,CAyCrB"}

package/dist/resolve/write-globals.js

@@ -12,8 +12,8 @@
  *  - **Only declare what the project can resolve.** Dependencies come from its manifest,
  *    so a component from an uninstalled package is skipped rather than degraded to `any`.
  */
-import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
-import { dirname, relative, sep, resolve as resolvePath } from 'node:path';
+import { mkdirSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { basename, dirname, relative, sep, resolve as resolvePath } from 'node:path';
 import { componentGlobals } from './component-globals.js';
 /** The marker every generated file carries, used to tell ours from a hand-written one. */
 const GENERATED_MARKER = 'GENERATED by @fluixi/compiler';
@@ -88,6 +88,38 @@ function projectDependencies(root) {
         return undefined;
     }
 }
+/**
+ * Names from the files a pattern rule points at: `/src/components/$1.tsx` lists
+ * `src/components` and offers each `X` for `X.tsx`. Only a project path with the group in
+ * the file name; the resolver still decides whether a name matches.
+ */
+export function patternCandidates(rules, root) {
+    const out = [];
+    for (const rule of rules) {
+        if (!('match' in rule) || !rule.module.startsWith('/'))
+            continue;
+        const dir = dirname(rule.module);
+        const file = basename(rule.module);
+        const group = file.match(/\$\d+/);
+        if (dir.includes('$') || !group || file.indexOf('$', group.index + 1) !== -1)
+            continue;
+        const before = file.slice(0, group.index);
+        const after = file.slice(group.index + group[0].length);
+        let entries;
+        try {
+            entries = readdirSync(resolvePath(root, dir.slice(1)));
+        }
+        catch {
+            continue;
+        }
+        for (const entry of entries) {
+            if (entry.length > before.length + after.length && entry.startsWith(before) && entry.endsWith(after)) {
+                out.push(entry.slice(before.length, entry.length - after.length));
+            }
+        }
+    }
+    return out;
+}
 /** Generate and write the declarations for `root`, returning what was done. */
 export function writeComponentGlobals(options, root) {
     if (options.globals === false)
@@ -106,6 +138,7 @@ export function writeComponentGlobals(options, root) {
     }
     const { source, declared } = componentGlobals(rules, {
         available: projectDependencies(root),
+        candidates: patternCandidates(rules, root),
         specifier: (module) => forTypeScript(module, dirname(target), root),
     });
     if (existing === source) {

package/dist/resolve/write-globals.mjs

@@ -1,6 +1,6 @@
 // src/resolve/write-globals.ts
-import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname, relative, sep, resolve as resolvePath } from "node:path";
+import { mkdirSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
+import { basename, dirname, relative, sep, resolve as resolvePath } from "node:path";
 
 // src/resolve/component-resolver.ts
 var isMapRule = (rule) => "components" in rule;
@@ -111,7 +111,9 @@ var INTRINSICS = {
   // does. `untrack` suppresses dependency collection, which is exactly the kind of thing
   // dependency analysis must not guess at.
   $untrack: { export: "untrack", module: REACTIVE_MODULE, returns: "plain" },
-  $untrackStore: { export: "untrackStore", module: "@fluixi/reactive/store", returns: "plain" }
+  $untrackStore: { export: "untrackStore", module: "@fluixi/reactive/store", returns: "plain" },
+  // An environment variable, public or server-only; the browser build refuses a secret.
+  $env: { export: "env", module: "@fluixi/start/env", returns: "plain" }
 };
 var INTRINSIC_CALL = new RegExp(`\\$(?:${Object.keys(INTRINSICS).map((n) => n.slice(1)).join("|")})\\s*\\(`);
 
@@ -153,7 +155,8 @@ function componentGlobals(rules, options = {}) {
     builtins = true,
     intrinsics = true,
     generator = "@fluixi/compiler",
-    specifier = (module) => module
+    specifier = (module) => module,
+    candidates = []
   } = options;
   const all = [...rules];
   if (builtins) {
@@ -165,7 +168,8 @@ function componentGlobals(rules, options = {}) {
   const shadowedByDom = [];
   const unavailable = [];
   const resolved = /* @__PURE__ */ new Map();
-  for (const name of [...resolver.names()].sort()) {
+  const names = /* @__PURE__ */ new Set([...resolver.names(), ...[...candidates].filter((n) => /^[A-Za-z_$][\w$]*$/.test(n))]);
+  for (const name of [...names].sort()) {
     const target = resolver.resolve(name);
     if (!target) continue;
     const pkg = packageOf(target.module);
@@ -176,7 +180,11 @@ function componentGlobals(rules, options = {}) {
       resolved.set(name, target);
     }
   }
-  const intrinsicModules = intrinsics ? [...new Set(Object.values(INTRINSICS).map((i) => i.module))] : [];
+  const usableIntrinsics = intrinsics ? Object.entries(INTRINSICS).filter(([, i]) => {
+    const pkg = packageOf(i.module);
+    return !available || !pkg || available.has(pkg);
+  }) : [];
+  const intrinsicModules = [...new Set(usableIntrinsics.map(([, i]) => i.module))];
   const modules = [
     .../* @__PURE__ */ new Set([...declared.map((name) => resolved.get(name).module), ...intrinsicModules])
   ].sort();
@@ -196,15 +204,18 @@ function componentGlobals(rules, options = {}) {
     return `//   import { ${n} } from '${module ? specifier(module) : ""}';
 `;
   }).join("") : "";
-  const intrinsicLines = intrinsics ? Object.entries(INTRINSICS).map(
+  const intrinsicLines = usableIntrinsics.map(
     ([name, intrinsic]) => `  const ${name}: typeof ${namespaceAlias(intrinsic.module)}.${intrinsic.export};`
-  ) : [];
+  );
   const patternRules = rules.filter((rule) => "match" in rule).length;
-  const patternNote = patternRules > 0 ? `//
+  const patternNote = patternRules === 0 ? "" : options.candidates ? `//
+// ${patternRules} pattern rule${patternRules === 1 ? "" : "s"}: declared for the files the module path
+// points at. A name with no such file still resolves at build time; declare it by hand.
+` : `//
 // ${patternRules} pattern rule${patternRules === 1 ? "" : "s"} cannot be declared:
 // a pattern matches unboundedly many names, so there is no list to emit. Those
 // tags still resolve at build time; declare them by hand if the editor needs them.
-` : "";
+`;
   const source = `// GENERATED by ${generator}, do not edit.
 //
 // The components \`resolve\` supplies without an import. This describes what the
@@ -261,6 +272,30 @@ function projectDependencies(root) {
     return void 0;
   }
 }
+function patternCandidates(rules, root) {
+  const out = [];
+  for (const rule of rules) {
+    if (!("match" in rule) || !rule.module.startsWith("/")) continue;
+    const dir = dirname(rule.module);
+    const file = basename(rule.module);
+    const group = file.match(/\$\d+/);
+    if (dir.includes("$") || !group || file.indexOf("$", group.index + 1) !== -1) continue;
+    const before = file.slice(0, group.index);
+    const after = file.slice(group.index + group[0].length);
+    let entries;
+    try {
+      entries = readdirSync(resolvePath(root, dir.slice(1)));
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      if (entry.length > before.length + after.length && entry.startsWith(before) && entry.endsWith(after)) {
+        out.push(entry.slice(before.length, entry.length - after.length));
+      }
+    }
+  }
+  return out;
+}
 function writeComponentGlobals(options, root) {
   if (options.globals === false) return { status: "skipped", reason: "disabled" };
   const rules = options.resolve ?? [];
@@ -276,6 +311,7 @@ function writeComponentGlobals(options, root) {
   }
   const { source, declared } = componentGlobals(rules, {
     available: projectDependencies(root),
+    candidates: patternCandidates(rules, root),
     specifier: (module) => forTypeScript(module, dirname(target), root)
   });
   if (existing === source) {
@@ -302,5 +338,6 @@ function warnIfUnreachable(root, target) {
 }
 export {
   DEFAULT_GLOBALS_PATH,
+  patternCandidates,
   writeComponentGlobals
 };

package/dist/{server-fns-DHOJLQKS.mjs → server-fns-BBZRZUPP.mjs}

@@ -1,11 +1,11 @@
-/*! @fluixi/compiler v1.0.0-alpha.90 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+/*! @fluixi/compiler v1.0.0-alpha.92 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
 import {
   MagicString
-} from "./chunk-RZ3JE33I.mjs";
+} from "./chunk-DWNWN5RH.mjs";
 import {
   serverFnId
-} from "./chunk-RCOCGLLD.mjs";
-import "./chunk-XTMCL6V7.mjs";
+} from "./chunk-QZ4CJPYP.mjs";
+import "./chunk-VOUI6XPV.mjs";
 
 // src/transform/server-fns.ts
 import { parse } from "@babel/parser";

package/dist/{server-functions-KSH5BDVT.mjs → server-functions-VEGLIFCE.mjs}

@@ -1,8 +1,8 @@
-/*! @fluixi/compiler v1.0.0-alpha.90 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+/*! @fluixi/compiler v1.0.0-alpha.92 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
 import {
   serverFnId
-} from "./chunk-RCOCGLLD.mjs";
-import "./chunk-XTMCL6V7.mjs";
+} from "./chunk-QZ4CJPYP.mjs";
+import "./chunk-VOUI6XPV.mjs";
 
 // src/frontend/babel/server-functions.ts
 import { transformSync } from "@babel/core";

package/dist/transform/index.cjs

@@ -1,4 +1,4 @@
-/*! @fluixi/compiler v1.0.0-alpha.90 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+/*! @fluixi/compiler v1.0.0-alpha.92 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -498,7 +498,9 @@ var INTRINSICS = {
   // does. `untrack` suppresses dependency collection, which is exactly the kind of thing
   // dependency analysis must not guess at.
   $untrack: { export: "untrack", module: REACTIVE_MODULE, returns: "plain" },
-  $untrackStore: { export: "untrackStore", module: "@fluixi/reactive/store", returns: "plain" }
+  $untrackStore: { export: "untrackStore", module: "@fluixi/reactive/store", returns: "plain" },
+  // An environment variable, public or server-only; the browser build refuses a secret.
+  $env: { export: "env", module: "@fluixi/start/env", returns: "plain" }
 };
 var RUNTIME_PRIMITIVES = {
   signal: "signal-handle",
@@ -2358,10 +2360,34 @@ function collectIntrinsicEdits(program) {
   });
   return { edits, diagnostics, imports };
 }
+function avoidBindingClashes(program, result, bound) {
+  const importedAsIs = /* @__PURE__ */ new Set();
+  for (const stmt of program.body ?? []) {
+    if (stmt.type !== "ImportDeclaration") continue;
+    const module2 = stmt.source.value;
+    for (const spec of stmt.specifiers ?? []) {
+      if (spec.type !== "ImportSpecifier") continue;
+      const imported = spec.imported.name ?? spec.imported.value;
+      if (imported === spec.local.name && result.imports.get(module2)?.has(imported)) {
+        importedAsIs.add(imported);
+      }
+    }
+  }
+  const aliases = /* @__PURE__ */ new Map();
+  for (const names of result.imports.values()) {
+    for (const name of names) if (bound.has(name) && !importedAsIs.has(name)) aliases.set(name, `__fx_${name}`);
+  }
+  if (!aliases.size) return;
+  for (const edit of result.edits) {
+    const alias = aliases.get(edit.code);
+    if (alias) edit.code = alias;
+  }
+  result.aliases = aliases;
+}
 function intrinsicImports(result, bound) {
   const lines = [];
   for (const [module2, names] of [...result.imports].sort(([a], [b]) => a.localeCompare(b))) {
-    const wanted = [...names].filter((name) => !bound.has(name)).sort();
+    const wanted = [...names].filter((name) => result.aliases?.has(name) || !bound.has(name)).sort().map((name) => result.aliases?.has(name) ? `${name} as ${result.aliases.get(name)}` : name);
     if (wanted.length) lines.push(`import { ${wanted.join(", ")} } from ${JSON.stringify(module2)};`);
   }
   return lines.length ? `${lines.join("\n")}
@@ -2561,6 +2587,7 @@ function transformTemplates(code, id, options = {}) {
   });
   const props = options.propsDestructure === false ? { edits: [], diagnostics: [], used: /* @__PURE__ */ new Set() } : collectPropsEdits(ast.program, code, { runtimeModule: options.runtimeModule });
   const intrinsics = options.intrinsics === false ? { edits: [], diagnostics: [], imports: /* @__PURE__ */ new Map() } : collectIntrinsicEdits(ast.program);
+  if (intrinsics.edits.length) avoidBindingClashes(ast.program, intrinsics, moduleBindings(ast.program));
   const sources = options.sourceLocations === true ? collectSourceEdits(ast.program, sourceName) : { edits: [], marked: 0 };
   const silent = found.length === 0 && props.edits.length === 0 && sources.edits.length === 0 && intrinsics.edits.length === 0 && intrinsics.diagnostics.length === 0 && props.diagnostics.length === 0;
   if (silent) return null;

package/dist/transform/index.mjs

@@ -1,4 +1,4 @@
-/*! @fluixi/compiler v1.0.0-alpha.90 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+/*! @fluixi/compiler v1.0.0-alpha.92 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
 
 // src/transform/templates.ts
 import { parse as parse2 } from "@babel/parser";
@@ -1530,7 +1530,9 @@ var INTRINSICS = {
   // does. `untrack` suppresses dependency collection, which is exactly the kind of thing
   // dependency analysis must not guess at.
   $untrack: { export: "untrack", module: REACTIVE_MODULE, returns: "plain" },
-  $untrackStore: { export: "untrackStore", module: "@fluixi/reactive/store", returns: "plain" }
+  $untrackStore: { export: "untrackStore", module: "@fluixi/reactive/store", returns: "plain" },
+  // An environment variable, public or server-only; the browser build refuses a secret.
+  $env: { export: "env", module: "@fluixi/start/env", returns: "plain" }
 };
 var RUNTIME_PRIMITIVES = {
   signal: "signal-handle",
@@ -3391,10 +3393,34 @@ function collectIntrinsicEdits(program) {
   });
   return { edits, diagnostics, imports };
 }
+function avoidBindingClashes(program, result, bound) {
+  const importedAsIs = /* @__PURE__ */ new Set();
+  for (const stmt of program.body ?? []) {
+    if (stmt.type !== "ImportDeclaration") continue;
+    const module = stmt.source.value;
+    for (const spec of stmt.specifiers ?? []) {
+      if (spec.type !== "ImportSpecifier") continue;
+      const imported = spec.imported.name ?? spec.imported.value;
+      if (imported === spec.local.name && result.imports.get(module)?.has(imported)) {
+        importedAsIs.add(imported);
+      }
+    }
+  }
+  const aliases = /* @__PURE__ */ new Map();
+  for (const names of result.imports.values()) {
+    for (const name of names) if (bound.has(name) && !importedAsIs.has(name)) aliases.set(name, `__fx_${name}`);
+  }
+  if (!aliases.size) return;
+  for (const edit of result.edits) {
+    const alias = aliases.get(edit.code);
+    if (alias) edit.code = alias;
+  }
+  result.aliases = aliases;
+}
 function intrinsicImports(result, bound) {
   const lines = [];
   for (const [module, names] of [...result.imports].sort(([a], [b]) => a.localeCompare(b))) {
-    const wanted = [...names].filter((name) => !bound.has(name)).sort();
+    const wanted = [...names].filter((name) => result.aliases?.has(name) || !bound.has(name)).sort().map((name) => result.aliases?.has(name) ? `${name} as ${result.aliases.get(name)}` : name);
     if (wanted.length) lines.push(`import { ${wanted.join(", ")} } from ${JSON.stringify(module)};`);
   }
   return lines.length ? `${lines.join("\n")}
@@ -3594,6 +3620,7 @@ function transformTemplates(code, id, options = {}) {
   });
   const props = options.propsDestructure === false ? { edits: [], diagnostics: [], used: /* @__PURE__ */ new Set() } : collectPropsEdits(ast.program, code, { runtimeModule: options.runtimeModule });
   const intrinsics = options.intrinsics === false ? { edits: [], diagnostics: [], imports: /* @__PURE__ */ new Map() } : collectIntrinsicEdits(ast.program);
+  if (intrinsics.edits.length) avoidBindingClashes(ast.program, intrinsics, moduleBindings(ast.program));
   const sources = options.sourceLocations === true ? collectSourceEdits(ast.program, sourceName) : { edits: [], marked: 0 };
   const silent = found.length === 0 && props.edits.length === 0 && sources.edits.length === 0 && intrinsics.edits.length === 0 && intrinsics.diagnostics.length === 0 && props.diagnostics.length === 0;
   if (silent) return null;

package/dist/transform/intrinsics.cjs

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/transform/intrinsics.ts
 var intrinsics_exports = {};
 __export(intrinsics_exports, {
+  avoidBindingClashes: () => avoidBindingClashes,
   collectIntrinsicEdits: () => collectIntrinsicEdits,
   intrinsicImports: () => intrinsicImports
 });
@@ -42,7 +43,9 @@ var INTRINSICS = {
   // does. `untrack` suppresses dependency collection, which is exactly the kind of thing
   // dependency analysis must not guess at.
   $untrack: { export: "untrack", module: REACTIVE_MODULE, returns: "plain" },
-  $untrackStore: { export: "untrackStore", module: "@fluixi/reactive/store", returns: "plain" }
+  $untrackStore: { export: "untrackStore", module: "@fluixi/reactive/store", returns: "plain" },
+  // An environment variable, public or server-only; the browser build refuses a secret.
+  $env: { export: "env", module: "@fluixi/start/env", returns: "plain" }
 };
 var RUNTIME_PRIMITIVES = {
   signal: "signal-handle",
@@ -205,10 +208,34 @@ function collectIntrinsicEdits(program) {
   });
   return { edits, diagnostics, imports };
 }
+function avoidBindingClashes(program, result, bound) {
+  const importedAsIs = /* @__PURE__ */ new Set();
+  for (const stmt of program.body ?? []) {
+    if (stmt.type !== "ImportDeclaration") continue;
+    const module2 = stmt.source.value;
+    for (const spec of stmt.specifiers ?? []) {
+      if (spec.type !== "ImportSpecifier") continue;
+      const imported = spec.imported.name ?? spec.imported.value;
+      if (imported === spec.local.name && result.imports.get(module2)?.has(imported)) {
+        importedAsIs.add(imported);
+      }
+    }
+  }
+  const aliases = /* @__PURE__ */ new Map();
+  for (const names of result.imports.values()) {
+    for (const name of names) if (bound.has(name) && !importedAsIs.has(name)) aliases.set(name, `__fx_${name}`);
+  }
+  if (!aliases.size) return;
+  for (const edit of result.edits) {
+    const alias = aliases.get(edit.code);
+    if (alias) edit.code = alias;
+  }
+  result.aliases = aliases;
+}
 function intrinsicImports(result, bound) {
   const lines = [];
   for (const [module2, names] of [...result.imports].sort(([a], [b]) => a.localeCompare(b))) {
-    const wanted = [...names].filter((name) => !bound.has(name)).sort();
+    const wanted = [...names].filter((name) => result.aliases?.has(name) || !bound.has(name)).sort().map((name) => result.aliases?.has(name) ? `${name} as ${result.aliases.get(name)}` : name);
     if (wanted.length) lines.push(`import { ${wanted.join(", ")} } from ${JSON.stringify(module2)};`);
   }
   return lines.length ? `${lines.join("\n")}

package/dist/transform/intrinsics.d.cts

@@ -14,8 +14,20 @@ export interface IntrinsicsResult {
     diagnostics: IntrinsicDiagnostic[];
     /** Runtime exports the rewritten code needs, by module. */
     imports: Map<string, Set<string>>;
+    /** Runtime exports imported under another name, because the module binds theirs. */
+    aliases?: Map<string, string>;
 }
 /** Find the `$` calls in a module and say what they compile to. */
 export declare function collectIntrinsicEdits(program: unknown): IntrinsicsResult;
+/**
+ * Point a rewritten call past a local binding of the same name.
+ *
+ * `$env('X')` becomes `env('X')`, and the import of `env` used to be skipped when the module
+ * already bound `env`, on the assumption that it was the same import. A config module with its
+ * own `const env = {…}` is common, and there the call reached the app's object instead. Such a
+ * name is now imported under a private alias. A module that imports that very export from that
+ * very module keeps the old behaviour: the binding is the runtime already.
+ */
+export declare function avoidBindingClashes(program: unknown, result: IntrinsicsResult, bound: Set<string>): void;
 /** The import statements a result needs, minus anything the module already binds. */
 export declare function intrinsicImports(result: IntrinsicsResult, bound: Set<string>): string;

package/dist/transform/intrinsics.d.ts

@@ -14,9 +14,21 @@ export interface IntrinsicsResult {
     diagnostics: IntrinsicDiagnostic[];
     /** Runtime exports the rewritten code needs, by module. */
     imports: Map<string, Set<string>>;
+    /** Runtime exports imported under another name, because the module binds theirs. */
+    aliases?: Map<string, string>;
 }
 /** Find the `$` calls in a module and say what they compile to. */
 export declare function collectIntrinsicEdits(program: unknown): IntrinsicsResult;
+/**
+ * Point a rewritten call past a local binding of the same name.
+ *
+ * `$env('X')` becomes `env('X')`, and the import of `env` used to be skipped when the module
+ * already bound `env`, on the assumption that it was the same import. A config module with its
+ * own `const env = {…}` is common, and there the call reached the app's object instead. Such a
+ * name is now imported under a private alias. A module that imports that very export from that
+ * very module keeps the old behaviour: the binding is the runtime already.
+ */
+export declare function avoidBindingClashes(program: unknown, result: IntrinsicsResult, bound: Set<string>): void;
 /** The import statements a result needs, minus anything the module already binds. */
 export declare function intrinsicImports(result: IntrinsicsResult, bound: Set<string>): string;
 //# sourceMappingURL=intrinsics.d.ts.map

package/dist/transform/intrinsics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"intrinsics.d.ts","sourceRoot":"","sources":["../../src/transform/intrinsics.ts"],"names":[],"mappings":"AAwBA,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,mBAAmB;IAClC,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,WAAW,EAAE,mBAAmB,EAAE,CAAC;IACnC,2DAA2D;IAC3D,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;CACnC;AAaD,mEAAmE;AACnE,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,CAuCxE;AAED,qFAAqF;AACrF,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,CAOrF"}
+{"version":3,"file":"intrinsics.d.ts","sourceRoot":"","sources":["../../src/transform/intrinsics.ts"],"names":[],"mappings":"AAwBA,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,mBAAmB;IAClC,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,WAAW,EAAE,mBAAmB,EAAE,CAAC;IACnC,2DAA2D;IAC3D,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAClC,oFAAoF;IACpF,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAaD,mEAAmE;AACnE,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,gBAAgB,CAuCxE;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAwBxG;AAED,qFAAqF;AACrF,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,CAUrF"}

package/dist/transform/intrinsics.js

@@ -66,11 +66,53 @@ export function collectIntrinsicEdits(program) {
     });
     return { edits, diagnostics, imports };
 }
+/**
+ * Point a rewritten call past a local binding of the same name.
+ *
+ * `$env('X')` becomes `env('X')`, and the import of `env` used to be skipped when the module
+ * already bound `env`, on the assumption that it was the same import. A config module with its
+ * own `const env = {…}` is common, and there the call reached the app's object instead. Such a
+ * name is now imported under a private alias. A module that imports that very export from that
+ * very module keeps the old behaviour: the binding is the runtime already.
+ */
+export function avoidBindingClashes(program, result, bound) {
+    const importedAsIs = new Set();
+    for (const stmt of program.body ?? []) {
+        if (stmt.type !== 'ImportDeclaration')
+            continue;
+        const module = stmt.source.value;
+        for (const spec of stmt.specifiers ?? []) {
+            if (spec.type !== 'ImportSpecifier')
+                continue;
+            const imported = (spec.imported.name ?? spec.imported.value);
+            if (imported === spec.local.name && result.imports.get(module)?.has(imported)) {
+                importedAsIs.add(imported);
+            }
+        }
+    }
+    const aliases = new Map();
+    for (const names of result.imports.values()) {
+        for (const name of names)
+            if (bound.has(name) && !importedAsIs.has(name))
+                aliases.set(name, `__fx_${name}`);
+    }
+    if (!aliases.size)
+        return;
+    for (const edit of result.edits) {
+        const alias = aliases.get(edit.code);
+        if (alias)
+            edit.code = alias;
+    }
+    result.aliases = aliases;
+}
 /** The import statements a result needs, minus anything the module already binds. */
 export function intrinsicImports(result, bound) {
     const lines = [];
     for (const [module, names] of [...result.imports].sort(([a], [b]) => a.localeCompare(b))) {
-        const wanted = [...names].filter((name) => !bound.has(name)).sort();
+        const wanted = [...names]
+            .filter((name) => result.aliases?.has(name) || !bound.has(name))
+            .sort()
+            .map((name) => (result.aliases?.has(name) ? `${name} as ${result.aliases.get(name)}` : name));
         if (wanted.length)
             lines.push(`import { ${wanted.join(', ')} } from ${JSON.stringify(module)};`);
     }