@farm.js/core 0.1.14 → 0.1.15

package/dist/server.cjs

@@ -23836,9 +23836,10 @@ function collectIsolatedClientBoundaries(ownerPath, root, options = {}) {
     const importedBindings = getStaticImportBindings(content);
     let estimatedBoundaryCount2 = 0;
     for (const specifier of new Set(getImportSpecifiers(content))) {
-      const importedPath = resolveImportedModuleSourcePath(moduleSourcePath, specifier, root);
+      const imported = resolveImportedModule(moduleSourcePath, specifier, root);
+      const importedPath = imported.path;
       if (!importedPath) continue;
-      if (!specifier.startsWith(".") && !specifier.startsWith("/")) {
+      if (!imported.local) {
         const packageMetadata = inspectPackageClientBoundary(importedPath, root, /* @__PURE__ */ new Set());
         if (packageMetadata.shouldHydrate) {
           if (options.staticPackageBoundaries) {
@@ -23907,8 +23908,8 @@ function inspectClientModuleMetadata(resolvedPath, root, visited, inspectIslandE
   let importsClientBoundary = false;
   let importedIslandStrategy = null;
   for (const specifier of getImportSpecifiers(content)) {
-    const importedPath = resolveImportedModuleSourcePath(resolvedPath, specifier, root);
-    const importedMetadata = !specifier.startsWith(".") && !specifier.startsWith("/") ? inspectPackageClientBoundary(importedPath, root, visited) : inspectClientModuleMetadata(importedPath, root, visited, false);
+    const imported = resolveImportedModule(resolvedPath, specifier, root);
+    const importedMetadata = imported.local ? inspectClientModuleMetadata(imported.path, root, visited, false) : inspectPackageClientBoundary(imported.path, root, visited);
     if (importedMetadata.isClientComponent || importedMetadata.shouldHydrate) {
       importsClientBoundary = true;
       if (importedIslandStrategy === null) {
@@ -24037,6 +24038,171 @@ function isTypeOnlyNamedClause(tokens, startIndex, endIndex) {
   return true;
 }
 __name(isTypeOnlyNamedClause, "isTypeOnlyNamedClause");
+function resolveImportedModule(importerPath, specifier, root) {
+  if (specifier.startsWith(".") || specifier.startsWith("/")) {
+    return { path: resolveImportedModuleSourcePath(importerPath, specifier, root), local: true };
+  }
+  const aliased = resolveProjectAliasSourcePath(specifier, root);
+  if (aliased !== void 0) return { path: aliased, local: true };
+  return { path: resolvePackageModuleSourcePath(importerPath, specifier, root), local: false };
+}
+__name(resolveImportedModule, "resolveImportedModule");
+var projectImportAliasCache = /* @__PURE__ */ new Map();
+var PROJECT_ALIAS_FILES = ["tsconfig.json", "jsconfig.json", "package.json"];
+function resolveProjectAliasSourcePath(specifier, root) {
+  if (!root) return void 0;
+  const projectRoot = import_path4.default.resolve(root);
+  let match;
+  for (const alias of getProjectImportAliases(projectRoot)) {
+    const captured = matchProjectImportAlias(alias, specifier);
+    if (captured === null) continue;
+    if (!match || alias.prefix.length > match.alias.prefix.length) match = { alias, captured };
+  }
+  if (!match) return void 0;
+  return resolveSourceCandidate(
+    match.alias.targets.map(
+      (target) => import_path4.default.normalize(match.alias.wildcard ? target.replace("*", match.captured) : target)
+    )
+  );
+}
+__name(resolveProjectAliasSourcePath, "resolveProjectAliasSourcePath");
+function matchProjectImportAlias(alias, specifier) {
+  if (!alias.wildcard) return specifier === alias.prefix ? "" : null;
+  if (specifier.length < alias.prefix.length + alias.suffix.length || !specifier.startsWith(alias.prefix) || !specifier.endsWith(alias.suffix)) {
+    return null;
+  }
+  return specifier.slice(alias.prefix.length, specifier.length - alias.suffix.length);
+}
+__name(matchProjectImportAlias, "matchProjectImportAlias");
+function getProjectImportAliases(projectRoot) {
+  const stamp = PROJECT_ALIAS_FILES.map((file) => {
+    try {
+      return String(import_fs2.default.statSync(import_path4.default.join(projectRoot, file)).mtimeMs);
+    } catch {
+      return "-";
+    }
+  }).join(":");
+  const cached = projectImportAliasCache.get(projectRoot);
+  if (cached?.stamp === stamp) return cached.aliases;
+  const aliases = [
+    ...readTsconfigPathAliases(projectRoot),
+    ...readPackageImportAliases(projectRoot)
+  ];
+  if (!aliases.some((alias) => alias.prefix === "@/")) {
+    aliases.push({
+      prefix: "@/",
+      suffix: "",
+      wildcard: true,
+      targets: [import_path4.default.join(projectRoot, "src", "*")]
+    });
+  }
+  projectImportAliasCache.set(projectRoot, { stamp, aliases });
+  return aliases;
+}
+__name(getProjectImportAliases, "getProjectImportAliases");
+function readTsconfigPathAliases(projectRoot) {
+  for (const name2 of ["tsconfig.json", "jsconfig.json"]) {
+    const configPath = import_path4.default.join(projectRoot, name2);
+    if (!import_fs2.default.existsSync(configPath)) continue;
+    const resolved = readTsconfigPaths(configPath, /* @__PURE__ */ new Set());
+    if (!resolved?.paths) return [];
+    const base = resolved.baseUrl ?? resolved.pathsDirectory;
+    return Object.entries(resolved.paths).flatMap(([pattern, targets]) => {
+      if (!Array.isArray(targets)) return [];
+      const wildcardIndex = pattern.indexOf("*");
+      return [
+        {
+          prefix: wildcardIndex === -1 ? pattern : pattern.slice(0, wildcardIndex),
+          suffix: wildcardIndex === -1 ? "" : pattern.slice(wildcardIndex + 1),
+          wildcard: wildcardIndex !== -1,
+          targets: targets.filter((target) => typeof target === "string").map((target) => import_path4.default.resolve(base, target))
+        }
+      ];
+    });
+  }
+  return [];
+}
+__name(readTsconfigPathAliases, "readTsconfigPathAliases");
+function readTsconfigPaths(configPath, visited) {
+  if (visited.has(configPath)) return null;
+  visited.add(configPath);
+  const config = readJsonWithComments(configPath);
+  if (!config) return null;
+  const directory = import_path4.default.dirname(configPath);
+  const parents = (Array.isArray(config.extends) ? config.extends : [config.extends]).filter(
+    (parent) => typeof parent === "string" && parent.startsWith(".")
+  );
+  let inherited = null;
+  for (const parent of parents) {
+    const parentPath = import_path4.default.resolve(
+      directory,
+      parent.endsWith(".json") ? parent : `${parent}.json`
+    );
+    inherited = readTsconfigPaths(parentPath, visited) ?? inherited;
+  }
+  const options = config.compilerOptions ?? {};
+  const baseUrl = typeof options.baseUrl === "string" ? import_path4.default.resolve(directory, options.baseUrl) : inherited?.baseUrl;
+  if (options.paths && typeof options.paths === "object") {
+    return { paths: options.paths, pathsDirectory: directory, baseUrl };
+  }
+  return inherited ? { ...inherited, baseUrl } : { pathsDirectory: directory, baseUrl };
+}
+__name(readTsconfigPaths, "readTsconfigPaths");
+function readPackageImportAliases(projectRoot) {
+  const imports = readPackageJson(import_path4.default.join(projectRoot, "package.json"))?.imports;
+  if (!imports || typeof imports !== "object") return [];
+  return Object.entries(imports).flatMap(([pattern, value]) => {
+    const target = resolveConditionalExportTarget(value);
+    if (!pattern.startsWith("#") || !target?.startsWith("./")) return [];
+    const wildcardIndex = pattern.indexOf("*");
+    return [
+      {
+        prefix: wildcardIndex === -1 ? pattern : pattern.slice(0, wildcardIndex),
+        suffix: wildcardIndex === -1 ? "" : pattern.slice(wildcardIndex + 1),
+        wildcard: wildcardIndex !== -1,
+        targets: [import_path4.default.resolve(projectRoot, target)]
+      }
+    ];
+  });
+}
+__name(readPackageImportAliases, "readPackageImportAliases");
+function readJsonWithComments(filePath) {
+  let source;
+  try {
+    source = import_fs2.default.readFileSync(filePath, "utf8");
+  } catch {
+    return null;
+  }
+  let output = "";
+  let inString = false;
+  for (let index = 0; index < source.length; index++) {
+    const char = source[index];
+    if (inString) {
+      output += char;
+      if (char === "\\") output += source[++index] ?? "";
+      else if (char === '"') inString = false;
+      continue;
+    }
+    if (char === '"') {
+      inString = true;
+      output += char;
+    } else if (char === "/" && source[index + 1] === "/") {
+      while (index < source.length && source[index] !== "\n") index++;
+      output += "\n";
+    } else if (char === "/" && source[index + 1] === "*") {
+      const end = source.indexOf("*/", index + 2);
+      index = end === -1 ? source.length : end + 1;
+    } else {
+      output += char;
+    }
+  }
+  try {
+    return JSON.parse(output.replace(/,(\s*[}\]])/g, "$1"));
+  } catch {
+    return null;
+  }
+}
+__name(readJsonWithComments, "readJsonWithComments");
 function resolveImportedModuleSourcePath(importerPath, specifier, root) {
   if (!specifier.startsWith(".") && !specifier.startsWith("/")) {
     return resolvePackageModuleSourcePath(importerPath, specifier, root);
@@ -29503,7 +29669,7 @@ _setFarmThemeServerSnapshotResolver(() => {
 });
 
 // package.json
-var version = "0.1.14";
+var version = "0.1.15";
 
 // src/version.ts
 var FARM_VERSION = version;

package/dist/server.mjs

@@ -40,7 +40,7 @@ import {
   farmPlugin,
   farmServerOnlyEntriesPlugin,
   mergeFarmViteConfig
-} from "./chunk-J2F5LFQ2.mjs";
+} from "./chunk-JRF3C33L.mjs";
 import "./chunk-27JNCYEK.mjs";
 import {
   readSchemaTables
@@ -188,7 +188,7 @@ import {
 } from "./chunk-Z2RZJZIZ.mjs";
 import {
   FARM_VERSION
-} from "./chunk-DNCKVMSV.mjs";
+} from "./chunk-UE75PB52.mjs";
 import "./chunk-54UPOYFS.mjs";
 import "./chunk-WNSDDRNU.mjs";
 import "./chunk-JPLUGGRV.mjs";

package/dist/version.cjs

@@ -25,7 +25,7 @@ __export(version_exports, {
 module.exports = __toCommonJS(version_exports);
 
 // package.json
-var version = "0.1.14";
+var version = "0.1.15";
 
 // src/version.ts
 var FARM_VERSION = version;

package/dist/version.mjs

@@ -1,6 +1,6 @@
 import {
   FARM_VERSION
-} from "./chunk-DNCKVMSV.mjs";
+} from "./chunk-UE75PB52.mjs";
 import "./chunk-LPEX4YW6.mjs";
 export {
   FARM_VERSION

package/dist/vite.cjs

@@ -19260,9 +19260,10 @@ function collectIsolatedClientBoundaries(ownerPath, root, options = {}) {
     const importedBindings = getStaticImportBindings(content);
     let estimatedBoundaryCount2 = 0;
     for (const specifier of new Set(getImportSpecifiers(content))) {
-      const importedPath = resolveImportedModuleSourcePath(moduleSourcePath, specifier, root);
+      const imported = resolveImportedModule(moduleSourcePath, specifier, root);
+      const importedPath = imported.path;
       if (!importedPath) continue;
-      if (!specifier.startsWith(".") && !specifier.startsWith("/")) {
+      if (!imported.local) {
         const packageMetadata = inspectPackageClientBoundary(importedPath, root, /* @__PURE__ */ new Set());
         if (packageMetadata.shouldHydrate) {
           if (options.staticPackageBoundaries) {
@@ -19331,8 +19332,8 @@ function inspectClientModuleMetadata(resolvedPath, root, visited, inspectIslandE
   let importsClientBoundary = false;
   let importedIslandStrategy = null;
   for (const specifier of getImportSpecifiers(content)) {
-    const importedPath = resolveImportedModuleSourcePath(resolvedPath, specifier, root);
-    const importedMetadata = !specifier.startsWith(".") && !specifier.startsWith("/") ? inspectPackageClientBoundary(importedPath, root, visited) : inspectClientModuleMetadata(importedPath, root, visited, false);
+    const imported = resolveImportedModule(resolvedPath, specifier, root);
+    const importedMetadata = imported.local ? inspectClientModuleMetadata(imported.path, root, visited, false) : inspectPackageClientBoundary(imported.path, root, visited);
     if (importedMetadata.isClientComponent || importedMetadata.shouldHydrate) {
       importsClientBoundary = true;
       if (importedIslandStrategy === null) {
@@ -19461,6 +19462,171 @@ function isTypeOnlyNamedClause(tokens, startIndex, endIndex) {
   return true;
 }
 __name(isTypeOnlyNamedClause, "isTypeOnlyNamedClause");
+function resolveImportedModule(importerPath, specifier, root) {
+  if (specifier.startsWith(".") || specifier.startsWith("/")) {
+    return { path: resolveImportedModuleSourcePath(importerPath, specifier, root), local: true };
+  }
+  const aliased = resolveProjectAliasSourcePath(specifier, root);
+  if (aliased !== void 0) return { path: aliased, local: true };
+  return { path: resolvePackageModuleSourcePath(importerPath, specifier, root), local: false };
+}
+__name(resolveImportedModule, "resolveImportedModule");
+var projectImportAliasCache = /* @__PURE__ */ new Map();
+var PROJECT_ALIAS_FILES = ["tsconfig.json", "jsconfig.json", "package.json"];
+function resolveProjectAliasSourcePath(specifier, root) {
+  if (!root) return void 0;
+  const projectRoot = import_path4.default.resolve(root);
+  let match;
+  for (const alias of getProjectImportAliases(projectRoot)) {
+    const captured = matchProjectImportAlias(alias, specifier);
+    if (captured === null) continue;
+    if (!match || alias.prefix.length > match.alias.prefix.length) match = { alias, captured };
+  }
+  if (!match) return void 0;
+  return resolveSourceCandidate(
+    match.alias.targets.map(
+      (target) => import_path4.default.normalize(match.alias.wildcard ? target.replace("*", match.captured) : target)
+    )
+  );
+}
+__name(resolveProjectAliasSourcePath, "resolveProjectAliasSourcePath");
+function matchProjectImportAlias(alias, specifier) {
+  if (!alias.wildcard) return specifier === alias.prefix ? "" : null;
+  if (specifier.length < alias.prefix.length + alias.suffix.length || !specifier.startsWith(alias.prefix) || !specifier.endsWith(alias.suffix)) {
+    return null;
+  }
+  return specifier.slice(alias.prefix.length, specifier.length - alias.suffix.length);
+}
+__name(matchProjectImportAlias, "matchProjectImportAlias");
+function getProjectImportAliases(projectRoot) {
+  const stamp = PROJECT_ALIAS_FILES.map((file) => {
+    try {
+      return String(import_fs2.default.statSync(import_path4.default.join(projectRoot, file)).mtimeMs);
+    } catch {
+      return "-";
+    }
+  }).join(":");
+  const cached = projectImportAliasCache.get(projectRoot);
+  if (cached?.stamp === stamp) return cached.aliases;
+  const aliases = [
+    ...readTsconfigPathAliases(projectRoot),
+    ...readPackageImportAliases(projectRoot)
+  ];
+  if (!aliases.some((alias) => alias.prefix === "@/")) {
+    aliases.push({
+      prefix: "@/",
+      suffix: "",
+      wildcard: true,
+      targets: [import_path4.default.join(projectRoot, "src", "*")]
+    });
+  }
+  projectImportAliasCache.set(projectRoot, { stamp, aliases });
+  return aliases;
+}
+__name(getProjectImportAliases, "getProjectImportAliases");
+function readTsconfigPathAliases(projectRoot) {
+  for (const name2 of ["tsconfig.json", "jsconfig.json"]) {
+    const configPath = import_path4.default.join(projectRoot, name2);
+    if (!import_fs2.default.existsSync(configPath)) continue;
+    const resolved = readTsconfigPaths(configPath, /* @__PURE__ */ new Set());
+    if (!resolved?.paths) return [];
+    const base = resolved.baseUrl ?? resolved.pathsDirectory;
+    return Object.entries(resolved.paths).flatMap(([pattern, targets]) => {
+      if (!Array.isArray(targets)) return [];
+      const wildcardIndex = pattern.indexOf("*");
+      return [
+        {
+          prefix: wildcardIndex === -1 ? pattern : pattern.slice(0, wildcardIndex),
+          suffix: wildcardIndex === -1 ? "" : pattern.slice(wildcardIndex + 1),
+          wildcard: wildcardIndex !== -1,
+          targets: targets.filter((target) => typeof target === "string").map((target) => import_path4.default.resolve(base, target))
+        }
+      ];
+    });
+  }
+  return [];
+}
+__name(readTsconfigPathAliases, "readTsconfigPathAliases");
+function readTsconfigPaths(configPath, visited) {
+  if (visited.has(configPath)) return null;
+  visited.add(configPath);
+  const config = readJsonWithComments(configPath);
+  if (!config) return null;
+  const directory = import_path4.default.dirname(configPath);
+  const parents = (Array.isArray(config.extends) ? config.extends : [config.extends]).filter(
+    (parent) => typeof parent === "string" && parent.startsWith(".")
+  );
+  let inherited = null;
+  for (const parent of parents) {
+    const parentPath = import_path4.default.resolve(
+      directory,
+      parent.endsWith(".json") ? parent : `${parent}.json`
+    );
+    inherited = readTsconfigPaths(parentPath, visited) ?? inherited;
+  }
+  const options = config.compilerOptions ?? {};
+  const baseUrl = typeof options.baseUrl === "string" ? import_path4.default.resolve(directory, options.baseUrl) : inherited?.baseUrl;
+  if (options.paths && typeof options.paths === "object") {
+    return { paths: options.paths, pathsDirectory: directory, baseUrl };
+  }
+  return inherited ? { ...inherited, baseUrl } : { pathsDirectory: directory, baseUrl };
+}
+__name(readTsconfigPaths, "readTsconfigPaths");
+function readPackageImportAliases(projectRoot) {
+  const imports = readPackageJson(import_path4.default.join(projectRoot, "package.json"))?.imports;
+  if (!imports || typeof imports !== "object") return [];
+  return Object.entries(imports).flatMap(([pattern, value]) => {
+    const target = resolveConditionalExportTarget(value);
+    if (!pattern.startsWith("#") || !target?.startsWith("./")) return [];
+    const wildcardIndex = pattern.indexOf("*");
+    return [
+      {
+        prefix: wildcardIndex === -1 ? pattern : pattern.slice(0, wildcardIndex),
+        suffix: wildcardIndex === -1 ? "" : pattern.slice(wildcardIndex + 1),
+        wildcard: wildcardIndex !== -1,
+        targets: [import_path4.default.resolve(projectRoot, target)]
+      }
+    ];
+  });
+}
+__name(readPackageImportAliases, "readPackageImportAliases");
+function readJsonWithComments(filePath) {
+  let source;
+  try {
+    source = import_fs2.default.readFileSync(filePath, "utf8");
+  } catch {
+    return null;
+  }
+  let output = "";
+  let inString = false;
+  for (let index = 0; index < source.length; index++) {
+    const char = source[index];
+    if (inString) {
+      output += char;
+      if (char === "\\") output += source[++index] ?? "";
+      else if (char === '"') inString = false;
+      continue;
+    }
+    if (char === '"') {
+      inString = true;
+      output += char;
+    } else if (char === "/" && source[index + 1] === "/") {
+      while (index < source.length && source[index] !== "\n") index++;
+      output += "\n";
+    } else if (char === "/" && source[index + 1] === "*") {
+      const end = source.indexOf("*/", index + 2);
+      index = end === -1 ? source.length : end + 1;
+    } else {
+      output += char;
+    }
+  }
+  try {
+    return JSON.parse(output.replace(/,(\s*[}\]])/g, "$1"));
+  } catch {
+    return null;
+  }
+}
+__name(readJsonWithComments, "readJsonWithComments");
 function resolveImportedModuleSourcePath(importerPath, specifier, root) {
   if (!specifier.startsWith(".") && !specifier.startsWith("/")) {
     return resolvePackageModuleSourcePath(importerPath, specifier, root);
@@ -24913,7 +25079,7 @@ _setFarmThemeServerSnapshotResolver(() => {
 });
 
 // package.json
-var version = "0.1.14";
+var version = "0.1.15";
 
 // src/version.ts
 var FARM_VERSION = version;

package/dist/vite.mjs

@@ -9,7 +9,7 @@ import {
   shouldEmitFarmClientRootHmr,
   transformIsolatedClientBoundaryModule,
   withFarmRequestTracing
-} from "./chunk-J2F5LFQ2.mjs";
+} from "./chunk-JRF3C33L.mjs";
 import "./chunk-27JNCYEK.mjs";
 import "./chunk-DHDVMXYK.mjs";
 import "./chunk-ZMSZZXOR.mjs";
@@ -76,7 +76,7 @@ import "./chunk-YMCXWPWK.mjs";
 import "./chunk-KI3MESHB.mjs";
 import "./chunk-QVKYGNVM.mjs";
 import "./chunk-Z2RZJZIZ.mjs";
-import "./chunk-DNCKVMSV.mjs";
+import "./chunk-UE75PB52.mjs";
 import "./chunk-54UPOYFS.mjs";
 import "./chunk-WNSDDRNU.mjs";
 import "./chunk-JPLUGGRV.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farm.js/core",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "Core Farm.js framework for modern integrated apps",
   "keywords": [
     "@farm.js/core",
@@ -675,8 +675,8 @@
   },
   "dependencies": {
     "@farming-labs/docs": "^0.2.118",
-    "@farming-labs/orm": "0.0.62",
-    "@farming-labs/orm-runtime": "0.0.62",
+    "@farming-labs/orm": "0.0.64",
+    "@farming-labs/orm-runtime": "0.0.64",
     "@formatjs/icu-messageformat-parser": "3.5.15",
     "@jridgewell/trace-mapping": "0.3.31",
     "@mdx-js/mdx": "^3.1.1",