akanjs 2.0.1 → 2.0.3

package/cli/application/application.runner.ts

@@ -36,12 +36,10 @@ export class ApplicationRunner extends runner("application") {
       dict: { appName, companyName: workspace.repoName, startDomain: "localhost" },
       options: { libs },
     });
-    await workspace.setTsPaths("app", appName);
     return AppExecutor.from(workspace, appName);
   }
   async removeApplication(app: App) {
     await app.workspace.exec(`rm -rf apps/${app.name}`);
-    await app.workspace.unsetTsPaths("app", app.name);
   }
   async getConfig(app: App) {
     return await app.getConfig();

package/cli/index.js

@@ -2827,28 +2827,24 @@ class WorkspaceExecutor extends Executor {
     const [appNames, libNames, pkgNames] = await Promise.all([this.getApps(), this.getLibs(), this.getPkgs()]);
     return [appNames, libNames, pkgNames];
   }
-  async setTsPaths(type, name) {
+  async setPkgTsPaths(name) {
     const rootTsConfig = await this.readJson("tsconfig.json");
     rootTsConfig.compilerOptions.paths ??= {};
-    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`];
+    rootTsConfig.compilerOptions.paths[name] = [`./pkgs/${name}/index.ts`];
+    rootTsConfig.compilerOptions.paths[`${name}/*`] = [`./pkgs/${name}/*`];
     if (rootTsConfig.references) {
-      if (!rootTsConfig.references.some((ref) => ref.path === `./${type}s/${name}/tsconfig.json`))
-        rootTsConfig.references.push({ path: `./${type}s/${name}/tsconfig.json` });
+      if (!rootTsConfig.references.some((ref) => ref.path === `./pkgs/${name}/tsconfig.json`))
+        rootTsConfig.references.push({ path: `./pkgs/${name}/tsconfig.json` });
     }
     await this.writeJson("tsconfig.json", rootTsConfig);
     return this;
   }
-  async unsetTsPaths(type, name) {
+  async unsetPkgTsPaths(name) {
     const rootTsConfig = await this.readJson("tsconfig.json");
-    const filteredKeys = Object.keys(rootTsConfig.compilerOptions.paths ?? {}).filter((key) => !key.startsWith(`@${name}`) && !key.startsWith(`@${type}s/${name}`));
+    const filteredKeys = Object.keys(rootTsConfig.compilerOptions.paths ?? {}).filter((key) => key !== name && key !== `${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}`));
+      rootTsConfig.references = rootTsConfig.references.filter((ref) => ref.path !== `./pkgs/${name}/tsconfig.json`);
     }
     await this.writeJson("tsconfig.json", rootTsConfig);
     return this;
@@ -3120,10 +3116,6 @@ class SysExecutor extends Executor {
     await this.scan();
     return fileContents;
   }
-  setTsPaths() {
-    this.workspace.setTsPaths(this.type, this.name);
-    return this;
-  }
 }
 
 class AppExecutor extends SysExecutor {
@@ -9341,13 +9333,11 @@ class LibraryRunner extends runner("library") {
   async createLibrary(libName, workspace) {
     await workspace.exec(`mkdir -p libs/${libName}`);
     await workspace.applyTemplate({ basePath: `libs/${libName}`, template: "libRoot", dict: { libName } });
-    await workspace.setTsPaths("lib", libName);
     const lib = LibExecutor.from(workspace, libName);
     return lib;
   }
   async removeLibrary(lib) {
     await lib.workspace.exec(`rm -rf libs/${lib.name}`);
-    await lib.workspace.unsetTsPaths("lib", lib.name);
   }
   async#copyInstalledLibrary(workspace, libName) {
     const installedPackageJson = `node_modules/akanjs/libs/${libName}/package.json`;
@@ -9368,7 +9358,6 @@ class LibraryRunner extends runner("library") {
     if (!copiedFromInstalledPackage)
       await this.#copyLibraryFromRepository(workspace, libName);
     await workspace.cp(`libs/${libName}/env/env.server.example.ts`, `libs/${libName}/env/env.server.testing.ts`);
-    await workspace.setTsPaths("lib", libName);
     await workspace.commit(`Add ${libName} library`);
     return LibExecutor.from(workspace, libName);
   }
@@ -9449,12 +9438,10 @@ class ApplicationRunner extends runner("application") {
       dict: { appName, companyName: workspace.repoName, startDomain: "localhost" },
       options: { libs }
     });
-    await workspace.setTsPaths("app", appName);
     return AppExecutor.from(workspace, appName);
   }
   async removeApplication(app) {
     await app.workspace.exec(`rm -rf apps/${app.name}`);
-    await app.workspace.unsetTsPaths("app", app.name);
   }
   async getConfig(app) {
     return await app.getConfig();
@@ -10048,11 +10035,11 @@ class PackageRunner extends runner("package") {
   }
   async createPackage(workspace, pkgName) {
     await workspace.applyTemplate({ basePath: `pkgs/${pkgName}`, template: "pkgRoot", dict: { pkgName } });
-    await workspace.setTsPaths("pkg", pkgName);
+    await workspace.setPkgTsPaths(pkgName);
   }
   async removePackage(pkg) {
     await pkg.workspace.exec(`rm -rf pkgs/${pkg.name}`);
-    await pkg.workspace.unsetTsPaths("pkg", pkg.name);
+    await pkg.workspace.unsetPkgTsPaths(pkg.name);
   }
   async scanSync(pkg) {
     const scanResult = await pkg.scan();

package/cli/library/library.runner.ts

@@ -5,13 +5,11 @@ export class LibraryRunner extends runner("library") {
   async createLibrary(libName: string, workspace: Workspace) {
     await workspace.exec(`mkdir -p libs/${libName}`);
     await workspace.applyTemplate({ basePath: `libs/${libName}`, template: "libRoot", dict: { libName } });
-    await workspace.setTsPaths("lib", libName);
     const lib = LibExecutor.from(workspace, libName);
     return lib;
   }
   async removeLibrary(lib: Lib) {
     await lib.workspace.exec(`rm -rf libs/${lib.name}`);
-    await lib.workspace.unsetTsPaths("lib", lib.name);
   }
 
   async #copyInstalledLibrary(workspace: Workspace, libName: string) {
@@ -32,7 +30,6 @@ export class LibraryRunner extends runner("library") {
     const copiedFromInstalledPackage = await this.#copyInstalledLibrary(workspace, libName);
     if (!copiedFromInstalledPackage) await this.#copyLibraryFromRepository(workspace, libName);
     await workspace.cp(`libs/${libName}/env/env.server.example.ts`, `libs/${libName}/env/env.server.testing.ts`);
-    await workspace.setTsPaths("lib", libName);
     await workspace.commit(`Add ${libName} library`);
     return LibExecutor.from(workspace, libName);
   }

package/cli/package/package.runner.ts

@@ -23,11 +23,11 @@ export class PackageRunner extends runner("package") {
   }
   async createPackage(workspace: Workspace, pkgName: string) {
     await workspace.applyTemplate({ basePath: `pkgs/${pkgName}`, template: "pkgRoot", dict: { pkgName } });
-    await workspace.setTsPaths("pkg", pkgName);
+    await workspace.setPkgTsPaths(pkgName);
   }
   async removePackage(pkg: Pkg) {
     await pkg.workspace.exec(`rm -rf pkgs/${pkg.name}`);
-    await pkg.workspace.unsetTsPaths("pkg", pkg.name);
+    await pkg.workspace.unsetPkgTsPaths(pkg.name);
   }
   async scanSync(pkg: Pkg) {
     const scanResult = await pkg.scan();

package/cli/templates/workspaceRoot/tsconfig.json.template

@@ -23,7 +23,7 @@
     "experimentalDecorators": true,
     "paths": {
       "@apps/*": ["./apps/*"],
-      "@libs/*": ["./libs/*"],
+      "@libs/*": ["./libs/*"]
     }
   }
 }

package/devkit/executors.ts

@@ -636,33 +636,29 @@ export class WorkspaceExecutor extends Executor {
     const [appNames, libNames, pkgNames] = await Promise.all([this.getApps(), this.getLibs(), this.getPkgs()]);
     return [appNames, libNames, pkgNames] as [string[], string[], string[]];
   }
-  async setTsPaths(type: "app" | "lib" | "pkg", name: string) {
+  async setPkgTsPaths(name: string) {
     const rootTsConfig = (await this.readJson("tsconfig.json")) as TsConfigJson;
     rootTsConfig.compilerOptions.paths ??= {};
-    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`];
+    rootTsConfig.compilerOptions.paths[name] = [`./pkgs/${name}/index.ts`];
+    rootTsConfig.compilerOptions.paths[`${name}/*`] = [`./pkgs/${name}/*`];
     if (rootTsConfig.references) {
-      if (!rootTsConfig.references.some((ref) => ref.path === `./${type}s/${name}/tsconfig.json`))
-        rootTsConfig.references.push({ path: `./${type}s/${name}/tsconfig.json` });
+      if (!rootTsConfig.references.some((ref) => ref.path === `./pkgs/${name}/tsconfig.json`))
+        rootTsConfig.references.push({ path: `./pkgs/${name}/tsconfig.json` });
     }
     await this.writeJson("tsconfig.json", rootTsConfig);
     return this;
   }
-  async unsetTsPaths(type: "app" | "lib" | "pkg", name: string) {
+  async unsetPkgTsPaths(name: string) {
     const rootTsConfig = (await this.readJson("tsconfig.json")) as TsConfigJson;
     const filteredKeys = Object.keys(rootTsConfig.compilerOptions.paths ?? {}).filter(
-      (key) => !key.startsWith(`@${name}`) && !key.startsWith(`@${type}s/${name}`),
+      (key) => key !== name && key !== `${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}`),
+        (ref) => ref.path !== `./pkgs/${name}/tsconfig.json`,
       ) as TsConfigJson["references"];
     }
     await this.writeJson("tsconfig.json", rootTsConfig);
@@ -1023,10 +1019,6 @@ export class SysExecutor extends Executor {
     await this.scan();
     return fileContents;
   }
-  setTsPaths() {
-    this.workspace.setTsPaths(this.type, this.name);
-    return this;
-  }
 }
 
 interface AppExecutorOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "sourceType": "module",
   "type": "module",
   "bin": {