akanjs 2.0.0-rc.0 → 2.0.0-rc.1

package/cli/index.js

@@ -9346,7 +9346,7 @@ import {
   fork,
   spawn
 } from "child_process";
-import { mkdir as mkdir2, stat as stat2 } from "fs/promises";
+import { mkdir as mkdir2, readdir as readDirEntries, stat as stat2 } from "fs/promises";
 import path7 from "path";
 import chalk4 from "chalk";
 
@@ -11074,7 +11074,7 @@ class Executor {
       const fileContent = await this.#applyTemplateFile({ templatePath: prefixTemplatePath, targetPath: path7.join(basePath2, filename), scanInfo, overwrite }, dict, options);
       return fileContent ? [fileContent] : [];
     } else {
-      const subdirs = await this.readdir(templatePath);
+      const subdirs = await readDirEntries(templatePath);
       const fileContents = (await Promise.all(subdirs.map(async (subdir) => {
         const subpath = path7.join(templatePath, subdir);
         if ((await stat2(subpath)).isFile()) {
@@ -11198,6 +11198,9 @@ class WorkspaceExecutor extends Executor {
     if (type === "lib" || type === "pkg")
       rootTsConfig.compilerOptions.paths[`@${name}`] = [`${type}s/${name}/index.ts`];
     rootTsConfig.compilerOptions.paths[`@${name}/*`] = [`${type}s/${name}/*`];
+    rootTsConfig.compilerOptions.paths[`@${type}s/${name}/*`] = [`${type}s/${name}/*`];
+    if (type === "lib" || type === "pkg")
+      rootTsConfig.compilerOptions.paths[`@${type}s/${name}`] = [`${type}s/${name}/index.ts`];
     if (rootTsConfig.references) {
       if (!rootTsConfig.references.some((ref) => ref.path === `./${type}s/${name}/tsconfig.json`))
         rootTsConfig.references.push({ path: `./${type}s/${name}/tsconfig.json` });
@@ -11207,7 +11210,7 @@ class WorkspaceExecutor extends Executor {
   }
   async unsetTsPaths(type, name) {
     const rootTsConfig = await this.readJson("tsconfig.json");
-    const filteredKeys = Object.keys(rootTsConfig.compilerOptions.paths ?? {}).filter((key) => !key.startsWith(`@${name}`));
+    const filteredKeys = Object.keys(rootTsConfig.compilerOptions.paths ?? {}).filter((key) => !key.startsWith(`@${name}`) && !key.startsWith(`@${type}s/${name}`));
     rootTsConfig.compilerOptions.paths = Object.fromEntries(filteredKeys.map((key) => [key, rootTsConfig.compilerOptions.paths?.[key] ?? []]));
     if (rootTsConfig.references) {
       rootTsConfig.references = rootTsConfig.references.filter((ref) => !ref.path.startsWith(`./${type}s/${name}`));
@@ -12737,6 +12740,8 @@ class BarrelAnalyzer {
     const rel = path12.relative(pkg.pkgDir, absFile);
     if (!rel || rel.startsWith("..") || path12.isAbsolute(rel))
       return null;
+    if (pkg.preserveFilePath)
+      return `${pkg.pkgName}/${rel.split(path12.sep).join("/")}`;
     const noExt = stripKnownExt(rel);
     const tail = collapseIndex(noExt);
     if (tail === "")
@@ -12817,7 +12822,7 @@ var collapseIndex = (relPathNoExt) => {
 
 import path13 from "path";
 import ts3 from "typescript";
-var createBarrelImportsPlugin = async (app, { skipPath = (p) => p.includes("node_modules"), pipeAfter } = {}) => {
+var createBarrelImportsPlugin = async (app, { skipPath = defaultSkipPath, pipeAfter } = {}) => {
   const akanConfig2 = await app.getConfig();
   const barrels = [...new Set(akanConfig2.barrelImports)].filter(Boolean);
   const analyzer = new BarrelAnalyzer({
@@ -12826,7 +12831,9 @@ var createBarrelImportsPlugin = async (app, { skipPath = (p) => p.includes("node
   return {
     name: "barrel-imports",
     setup(build) {
-      build.onLoad({ filter: /^(?!.*[\\/]node_modules[\\/]).*\.(tsx|ts|jsx|js)(\?v=\d+)?$/ }, async (args) => {
+      build.onLoad({
+        filter: /^(?:(?!.*[\\/]node_modules[\\/]).*|.*[\\/]node_modules[\\/]akanjs[\\/].*)\.(tsx|ts|jsx|js)(\?v=\d+)?$/
+      }, async (args) => {
         const realPath = args.path.replace(/\?v=\d+$/, "");
         const loader = loaderFor(realPath);
         if (skipPath(realPath)) {
@@ -12936,6 +12943,9 @@ var createTsconfigPackageResolver = async (app) => {
   };
 };
 var CANDIDATE_EXTS2 = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"];
+var NODE_MODULES_RE = /[\\/]node_modules[\\/]/;
+var AKANJS_NODE_MODULE_RE = /[\\/]node_modules[\\/]akanjs[\\/]/;
+var defaultSkipPath = (absPath) => NODE_MODULES_RE.test(absPath) && !AKANJS_NODE_MODULE_RE.test(absPath);
 var resolveNodePackageExport = async (workspaceRoot, specifier) => {
   const packageName = getPackageName(specifier);
   if (!packageName)
@@ -12955,7 +12965,7 @@ var resolveNodePackageExport = async (workspaceRoot, specifier) => {
     if (!entryFile)
       return null;
     const pkgEntryName = specifier;
-    return { pkgName: pkgEntryName, entryFile, pkgDir: path13.dirname(entryFile) };
+    return { pkgName: pkgEntryName, entryFile, pkgDir: path13.dirname(entryFile), preserveFilePath: true };
   } catch {
     return null;
   }

package/cli/templates/app/env/env.server.debug.ts.template

@@ -1,10 +1,7 @@
-import { getEnv() } from "akanjs/base";
+import { getEnv } from "akanjs/base";
 
 import type { ModulesOptions } from "../lib/option";
 
 export const env: ModulesOptions = {
   ...getEnv(),
-  hostname: null,
-  redis: {},
-  
 };

package/devkit/executors.ts

@@ -7,7 +7,7 @@ import {
   type SpawnOptions,
   spawn,
 } from "node:child_process";
-import { mkdir, stat } from "node:fs/promises";
+import { mkdir, readdir as readDirEntries, stat } from "node:fs/promises";
 import path from "node:path";
 import {
   capitalize,
@@ -455,7 +455,7 @@ export class Executor {
       );
       return fileContent ? [fileContent] : ([] as FileContent[]);
     } else {
-      const subdirs = await this.readdir(templatePath);
+      const subdirs = await readDirEntries(templatePath);
       const fileContents = (
         await Promise.all(
           subdirs.map(async (subdir) => {
@@ -615,6 +615,9 @@ export class WorkspaceExecutor extends Executor {
     if (type === "lib" || type === "pkg")
       rootTsConfig.compilerOptions.paths[`@${name}`] = [`${type}s/${name}/index.ts`];
     rootTsConfig.compilerOptions.paths[`@${name}/*`] = [`${type}s/${name}/*`];
+    rootTsConfig.compilerOptions.paths[`@${type}s/${name}/*`] = [`${type}s/${name}/*`];
+    if (type === "lib" || type === "pkg")
+      rootTsConfig.compilerOptions.paths[`@${type}s/${name}`] = [`${type}s/${name}/index.ts`];
     if (rootTsConfig.references) {
       if (!rootTsConfig.references.some((ref) => ref.path === `./${type}s/${name}/tsconfig.json`))
         rootTsConfig.references.push({ path: `./${type}s/${name}/tsconfig.json` });
@@ -625,7 +628,7 @@ export class WorkspaceExecutor extends Executor {
   async unsetTsPaths(type: "app" | "lib" | "pkg", name: string) {
     const rootTsConfig = (await this.readJson("tsconfig.json")) as TsConfigJson;
     const filteredKeys = Object.keys(rootTsConfig.compilerOptions.paths ?? {}).filter(
-      (key) => !key.startsWith(`@${name}`),
+      (key) => !key.startsWith(`@${name}`) && !key.startsWith(`@${type}s/${name}`),
     );
     rootTsConfig.compilerOptions.paths = Object.fromEntries(
       filteredKeys.map((key) => [key, rootTsConfig.compilerOptions.paths?.[key] ?? []]),

package/devkit/transforms/barrelAnalyzer.ts

@@ -17,6 +17,8 @@ export interface PackageEntry {
   entryFile: string;
   /** Absolute directory used as the base for subpath computation. Typically dirname(entryFile). */
   pkgDir: string;
+  /** Preserve concrete file paths for package exports that do not support extensionless deep imports. */
+  preserveFilePath?: boolean;
 }
 
 export interface BarrelAnalyzerOptions {
@@ -162,6 +164,7 @@ export class BarrelAnalyzer {
   #subpathFor(pkg: PackageEntry, absFile: string): string | null {
     const rel = path.relative(pkg.pkgDir, absFile);
     if (!rel || rel.startsWith("..") || path.isAbsolute(rel)) return null;
+    if (pkg.preserveFilePath) return `${pkg.pkgName}/${rel.split(path.sep).join("/")}`;
     const noExt = stripKnownExt(rel);
 
     const tail = collapseIndex(noExt);

package/devkit/transforms/barrelImportsPlugin.ts

@@ -19,7 +19,7 @@ export interface BarrelImportsPluginOptions {
 
 export const createBarrelImportsPlugin = async (
   app: App,
-  { skipPath = (p) => p.includes("node_modules"), pipeAfter }: BarrelImportsPluginOptions = {},
+  { skipPath = defaultSkipPath, pipeAfter }: BarrelImportsPluginOptions = {},
 ): Promise<BunPlugin> => {
   const akanConfig = await app.getConfig();
   const barrels = [...new Set(akanConfig.barrelImports)].filter(Boolean);
@@ -31,40 +31,46 @@ export const createBarrelImportsPlugin = async (
     name: "barrel-imports",
     setup(build) {
 
-      build.onLoad({ filter: /^(?!.*[\\/]node_modules[\\/]).*\.(tsx|ts|jsx|js)(\?v=\d+)?$/ }, async (args) => {
-        const realPath = args.path.replace(/\?v=\d+$/, "");
-        const loader = loaderFor(realPath);
-        if (skipPath(realPath)) {
-          const raw = await Bun.file(realPath).text();
-          return { contents: raw, loader };
-        }
+      build.onLoad(
+        {
+          filter:
+            /^(?:(?!.*[\\/]node_modules[\\/]).*|.*[\\/]node_modules[\\/]akanjs[\\/].*)\.(tsx|ts|jsx|js)(\?v=\d+)?$/,
+        },
+        async (args) => {
+          const realPath = args.path.replace(/\?v=\d+$/, "");
+          const loader = loaderFor(realPath);
+          if (skipPath(realPath)) {
+            const raw = await Bun.file(realPath).text();
+            return { contents: raw, loader };
+          }
 
-        let source = await Bun.file(realPath).text();
+          let source = await Bun.file(realPath).text();
 
-        const hasMacroAttr = MACRO_ATTR_RE.test(source);
+          const hasMacroAttr = MACRO_ATTR_RE.test(source);
 
-        if (!hasMacroAttr && barrels.length > 0) {
-          
-          let maybe = false;
-          for (const b of barrels) {
-            if (source.includes(b)) {
-              maybe = true;
-              break;
+          if (!hasMacroAttr && barrels.length > 0) {
+            
+            let maybe = false;
+            for (const b of barrels) {
+              if (source.includes(b)) {
+                maybe = true;
+                break;
+              }
+            }
+            if (maybe) {
+              const rewritten = await rewriteBarrelImports(source, barrels, analyzer);
+              if (rewritten !== null) source = rewritten;
             }
           }
-          if (maybe) {
-            const rewritten = await rewriteBarrelImports(source, barrels, analyzer);
-            if (rewritten !== null) source = rewritten;
-          }
-        }
 
-        if (pipeAfter) {
-          const piped = await pipeAfter(source, { path: realPath });
-          if (piped !== null) source = piped;
-        }
+          if (pipeAfter) {
+            const piped = await pipeAfter(source, { path: realPath });
+            if (piped !== null) source = piped;
+          }
 
-        return { contents: source, loader };
-      });
+          return { contents: source, loader };
+        },
+      );
     },
   };
 };
@@ -162,6 +168,10 @@ export const createTsconfigPackageResolver = async (
 
 const CANDIDATE_EXTS = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"];
 
+const NODE_MODULES_RE = /[\\/]node_modules[\\/]/;
+const AKANJS_NODE_MODULE_RE = /[\\/]node_modules[\\/]akanjs[\\/]/;
+const defaultSkipPath = (absPath: string) => NODE_MODULES_RE.test(absPath) && !AKANJS_NODE_MODULE_RE.test(absPath);
+
 type ExportValue = string | string[] | { [condition: string]: ExportValue | undefined };
 
 const resolveNodePackageExport = async (workspaceRoot: string, specifier: string): Promise<PackageEntry | null> => {
@@ -184,7 +194,7 @@ const resolveNodePackageExport = async (workspaceRoot: string, specifier: string
     const entryFile = await resolveFileCandidate(path.resolve(pkgDir, rel));
     if (!entryFile) return null;
     const pkgEntryName = specifier;
-    return { pkgName: pkgEntryName, entryFile, pkgDir: path.dirname(entryFile) };
+    return { pkgName: pkgEntryName, entryFile, pkgDir: path.dirname(entryFile), preserveFilePath: true };
   } catch {
     return null;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.0.0-rc.0",
+  "version": "2.0.0-rc.1",
   "sourceType": "module",
   "type": "module",
   "bin": {

package/cli/templates/app/tsconfig.spec.json.template

@@ -1,7 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "types": ["bun-types"]
-  },
-  "include": ["**/*.test.ts"]
-}

package/cli/templates/libRoot/tsconfig.spec.json.template

@@ -1,7 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "types": ["bun-types"]
-  },
-  "include": ["**/*.test.ts"]
-}