@akanjs/devkit 0.9.60-canary.0 → 0.9.60-canary.1

package/cjs/src/dependencyScanner.js

@@ -31,6 +31,7 @@ __export(dependencyScanner_exports, {
 });
 module.exports = __toCommonJS(dependencyScanner_exports);
 var fs = __toESM(require("fs"));
+var import_ignore = __toESM(require("ignore"));
 var path = __toESM(require("path"));
 var ts = __toESM(require("typescript"));
 class TypeScriptDependencyScanner {
@@ -39,10 +40,19 @@ class TypeScriptDependencyScanner {
   directory;
   tsconfig;
   rootPackageJson;
-  constructor(directory, { tsconfig, rootPackageJson }) {
+  ig;
+  workspaceRoot;
+  constructor(directory, {
+    workspaceRoot,
+    tsconfig,
+    rootPackageJson,
+    gitignorePatterns = []
+  }) {
     this.directory = directory;
     this.tsconfig = tsconfig;
     this.rootPackageJson = rootPackageJson;
+    this.ig = (0, import_ignore.default)().add(gitignorePatterns);
+    this.workspaceRoot = workspaceRoot;
   }
   async getMonorepoDependencies(projectName) {
     const npmSet = new Set(
@@ -104,6 +114,9 @@ class TypeScriptDependencyScanner {
       const entries = await fs.promises.readdir(dir, { withFileTypes: true });
       for (const entry of entries) {
         const fullPath = path.join(dir, entry.name);
+        const relativePath = path.relative(this.workspaceRoot, fullPath);
+        if (this.ig.ignores(relativePath))
+          continue;
         if (entry.isDirectory()) {
           if (!["node_modules", "dist", "build", ".git", ".next", "public", "ios", "android"].includes(entry.name))
             await processDirectory(fullPath);

package/cjs/src/executors.js

@@ -325,6 +325,14 @@ class Executor {
     this.writeJson("package.json", packageJson);
     this.#packageJson = packageJson;
   }
+  #gitignorePatterns = [];
+  getGitignorePatterns() {
+    if (this.#gitignorePatterns.length)
+      return this.#gitignorePatterns;
+    const gitignore = this.readFile(".gitignore");
+    this.#gitignorePatterns = gitignore.split("\n").map((line) => line.trim()).filter((line) => !!line && !line.startsWith("#"));
+    return this.#gitignorePatterns;
+  }
   async #applyTemplateFile({
     templatePath,
     targetPath,
@@ -620,7 +628,12 @@ class SysExecutor extends Executor {
   async getConfig({ refresh } = {}) {
     if (this.#akanConfig && !refresh)
       return this.#akanConfig;
-    this.#akanConfig = this.type === "app" ? await (0, import_config.getAppConfig)(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name }) : await (0, import_config.getLibConfig)(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "lib", name: this.name });
+    const tsconfig = this.getTsConfig();
+    this.#akanConfig = this.type === "app" ? await (0, import_config.getAppConfig)(
+      this.cwdPath,
+      { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name },
+      tsconfig
+    ) : await (0, import_config.getLibConfig)(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "lib", name: this.name });
     return this.#akanConfig;
   }
   async getModules() {
@@ -774,11 +787,11 @@ class SysExecutor extends Executor {
     return modules.map((module2) => this.getLocalFile(`lib/${module2}/${module2}.constant.ts`));
   }
   async getConstantFilesWithLibs() {
-    const config = await this.getConfig();
+    const scanInfo = this.type === "app" ? await import_scanInfo.AppInfo.fromExecutor(this) : await import_scanInfo.LibInfo.fromExecutor(this);
     const sysContantFiles = await this.getConstantFiles();
     const sysScalarConstantFiles = await this.getScalarConstantFiles();
     const libConstantFiles = await Promise.all(
-      config.libs.map(async (lib) => [
+      scanInfo.getLibs().map(async (lib) => [
         ...await LibExecutor.from(this, lib).getConstantFiles(),
         ...await LibExecutor.from(this, lib).getScalarConstantFiles()
       ])
@@ -831,11 +844,11 @@ class AppExecutor extends SysExecutor {
   async getConfig({ refresh } = {}) {
     if (this.#akanConfig && !refresh)
       return this.#akanConfig;
-    this.#akanConfig = await (0, import_config.getAppConfig)(this.cwdPath, {
-      ...this.workspace.getBaseDevEnv(),
-      type: "app",
-      name: this.name
-    });
+    this.#akanConfig = await (0, import_config.getAppConfig)(
+      this.cwdPath,
+      { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name },
+      this.getTsConfig()
+    );
     return this.#akanConfig;
   }
   async syncAssets(libDeps) {
@@ -858,10 +871,18 @@ class AppExecutor extends SysExecutor {
     ]);
   }
   async increaseBuildNum() {
-    await (0, import_config.increaseBuildNum)(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name });
+    await (0, import_config.increaseBuildNum)(
+      this.cwdPath,
+      { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name },
+      this.getTsConfig()
+    );
   }
   async decreaseBuildNum() {
-    await (0, import_config.decreaseBuildNum)(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name });
+    await (0, import_config.decreaseBuildNum)(
+      this.cwdPath,
+      { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name },
+      this.getTsConfig()
+    );
   }
 }
 class LibExecutor extends SysExecutor {

package/cjs/src/scanInfo.js

@@ -77,7 +77,13 @@ class ScanInfo {
     const akanConfig = await exec.getConfig();
     const tsconfig = exec.getTsConfig();
     const rootPackageJson = exec.workspace.getPackageJson();
-    const scanner = new import_dependencyScanner.TypeScriptDependencyScanner(exec.cwdPath, { tsconfig, rootPackageJson });
+    const gitignorePatterns = exec.workspace.getGitignorePatterns();
+    const scanner = new import_dependencyScanner.TypeScriptDependencyScanner(exec.cwdPath, {
+      workspaceRoot: exec.workspace.cwdPath,
+      tsconfig,
+      rootPackageJson,
+      gitignorePatterns
+    });
     const { pkgDeps, libDeps, npmDeps } = await scanner.getMonorepoDependencies(exec.name);
     const files = {
       constant: { databases: [], scalars: [] },
@@ -181,15 +187,6 @@ class ScanInfo {
         });
       })
     ]);
-    const missingLibDeps = [];
-    libDeps.forEach((libName) => {
-      if (!akanConfig.libs.includes(libName))
-        missingLibDeps.push(libName);
-    });
-    if (missingLibDeps.length)
-      throw new Error(
-        `Missing libs: ${missingLibDeps.join(", ")}, add these dependencies in akan.config.ts as { libs: [...other deps, ${missingLibDeps.join(", ")}] }`
-      );
     const scanResult = {
       name: exec.name,
       type: exec.type,
@@ -279,7 +276,7 @@ class AppInfo extends ScanInfo {
     if (this.#sortedLibs)
       return this.#sortedLibs;
     const libIndices = LibInfo.getSortedLibIndices();
-    this.#sortedLibs = this.akanConfig.libs.sort((libNameA, libNameB) => {
+    this.#sortedLibs = this.getScanResult().libDeps.sort((libNameA, libNameB) => {
       const indexA = libIndices.get(libNameA);
       const indexB = libIndices.get(libNameB);
       if (indexA === void 0 || indexB === void 0)
@@ -319,7 +316,7 @@ class LibInfo extends ScanInfo {
     if (this.#sortedLibIndices)
       return this.#sortedLibIndices;
     this.#sortedLibIndices = new Map(
-      [...this.libInfos.entries()].sort(([_, libInfoA], [__, libInfoB]) => libInfoA.akanConfig.libs.includes(libInfoB.name) ? 1 : -1).map(([libName], index) => [libName, index])
+      [...this.libInfos.entries()].sort(([_, libInfoA], [__, libInfoB]) => libInfoA.getScanResult().libDeps.includes(libInfoB.name) ? 1 : -1).map(([libName], index) => [libName, index])
     );
     return this.#sortedLibIndices;
   }
@@ -353,7 +350,7 @@ class LibInfo extends ScanInfo {
     if (this.#sortedLibs)
       return this.#sortedLibs;
     const libs = LibInfo.getSortedLibIndices();
-    this.#sortedLibs = this.akanConfig.libs.sort((libNameA, libNameB) => {
+    this.#sortedLibs = this.scanResult.libDeps.sort((libNameA, libNameB) => {
       const indexA = libs.get(libNameA);
       const indexB = libs.get(libNameB);
       if (indexA === void 0 || indexB === void 0)
@@ -366,7 +363,7 @@ class LibInfo extends ScanInfo {
     return this.#getSortedLibs();
   }
   getLibInfo(libName) {
-    if (!this.getScanResult().akanConfig.libs.includes(libName))
+    if (!this.getScanResult().libDeps.includes(libName))
       return void 0;
     const libSet = new Set(this.#getSortedLibs());
     if (!libSet.has(libName))
@@ -391,7 +388,13 @@ class PkgInfo {
   static async getScanResult(exec) {
     const tsconfig = exec.getTsConfig();
     const rootPackageJson = exec.workspace.getPackageJson();
-    const scanner = new import_dependencyScanner.TypeScriptDependencyScanner(exec.cwdPath, { tsconfig, rootPackageJson });
+    const gitignorePatterns = exec.workspace.getGitignorePatterns();
+    const scanner = new import_dependencyScanner.TypeScriptDependencyScanner(exec.cwdPath, {
+      workspaceRoot: exec.workspace.cwdPath,
+      tsconfig,
+      rootPackageJson,
+      gitignorePatterns
+    });
     const npmSet = new Set(Object.keys({ ...rootPackageJson.dependencies, ...rootPackageJson.devDependencies }));
     const pkgPathSet = new Set(
       Object.keys(tsconfig.compilerOptions.paths ?? {}).filter((path2) => tsconfig.compilerOptions.paths?.[path2]?.some((resolve) => resolve.startsWith("pkgs/"))).map((path2) => path2.replace("/*", ""))

package/esm/src/dependencyScanner.js

@@ -1,4 +1,5 @@
 import * as fs from "fs";
+import ignore from "ignore";
 import * as path from "path";
 import * as ts from "typescript";
 class TypeScriptDependencyScanner {
@@ -7,10 +8,19 @@ class TypeScriptDependencyScanner {
   directory;
   tsconfig;
   rootPackageJson;
-  constructor(directory, { tsconfig, rootPackageJson }) {
+  ig;
+  workspaceRoot;
+  constructor(directory, {
+    workspaceRoot,
+    tsconfig,
+    rootPackageJson,
+    gitignorePatterns = []
+  }) {
     this.directory = directory;
     this.tsconfig = tsconfig;
     this.rootPackageJson = rootPackageJson;
+    this.ig = ignore().add(gitignorePatterns);
+    this.workspaceRoot = workspaceRoot;
   }
   async getMonorepoDependencies(projectName) {
     const npmSet = new Set(
@@ -72,6 +82,9 @@ class TypeScriptDependencyScanner {
       const entries = await fs.promises.readdir(dir, { withFileTypes: true });
       for (const entry of entries) {
         const fullPath = path.join(dir, entry.name);
+        const relativePath = path.relative(this.workspaceRoot, fullPath);
+        if (this.ig.ignores(relativePath))
+          continue;
         if (entry.isDirectory()) {
           if (!["node_modules", "dist", "build", ".git", ".next", "public", "ios", "android"].includes(entry.name))
             await processDirectory(fullPath);

package/esm/src/executors.js

@@ -290,6 +290,14 @@ class Executor {
     this.writeJson("package.json", packageJson);
     this.#packageJson = packageJson;
   }
+  #gitignorePatterns = [];
+  getGitignorePatterns() {
+    if (this.#gitignorePatterns.length)
+      return this.#gitignorePatterns;
+    const gitignore = this.readFile(".gitignore");
+    this.#gitignorePatterns = gitignore.split("\n").map((line) => line.trim()).filter((line) => !!line && !line.startsWith("#"));
+    return this.#gitignorePatterns;
+  }
   async #applyTemplateFile({
     templatePath,
     targetPath,
@@ -585,7 +593,12 @@ class SysExecutor extends Executor {
   async getConfig({ refresh } = {}) {
     if (this.#akanConfig && !refresh)
       return this.#akanConfig;
-    this.#akanConfig = this.type === "app" ? await getAppConfig(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name }) : await getLibConfig(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "lib", name: this.name });
+    const tsconfig = this.getTsConfig();
+    this.#akanConfig = this.type === "app" ? await getAppConfig(
+      this.cwdPath,
+      { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name },
+      tsconfig
+    ) : await getLibConfig(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "lib", name: this.name });
     return this.#akanConfig;
   }
   async getModules() {
@@ -739,11 +752,11 @@ class SysExecutor extends Executor {
     return modules.map((module) => this.getLocalFile(`lib/${module}/${module}.constant.ts`));
   }
   async getConstantFilesWithLibs() {
-    const config = await this.getConfig();
+    const scanInfo = this.type === "app" ? await AppInfo.fromExecutor(this) : await LibInfo.fromExecutor(this);
     const sysContantFiles = await this.getConstantFiles();
     const sysScalarConstantFiles = await this.getScalarConstantFiles();
     const libConstantFiles = await Promise.all(
-      config.libs.map(async (lib) => [
+      scanInfo.getLibs().map(async (lib) => [
         ...await LibExecutor.from(this, lib).getConstantFiles(),
         ...await LibExecutor.from(this, lib).getScalarConstantFiles()
       ])
@@ -796,11 +809,11 @@ class AppExecutor extends SysExecutor {
   async getConfig({ refresh } = {}) {
     if (this.#akanConfig && !refresh)
       return this.#akanConfig;
-    this.#akanConfig = await getAppConfig(this.cwdPath, {
-      ...this.workspace.getBaseDevEnv(),
-      type: "app",
-      name: this.name
-    });
+    this.#akanConfig = await getAppConfig(
+      this.cwdPath,
+      { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name },
+      this.getTsConfig()
+    );
     return this.#akanConfig;
   }
   async syncAssets(libDeps) {
@@ -823,10 +836,18 @@ class AppExecutor extends SysExecutor {
     ]);
   }
   async increaseBuildNum() {
-    await increaseBuildNum(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name });
+    await increaseBuildNum(
+      this.cwdPath,
+      { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name },
+      this.getTsConfig()
+    );
   }
   async decreaseBuildNum() {
-    await decreaseBuildNum(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name });
+    await decreaseBuildNum(
+      this.cwdPath,
+      { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name },
+      this.getTsConfig()
+    );
   }
 }
 class LibExecutor extends SysExecutor {

package/esm/src/scanInfo.js

@@ -42,7 +42,13 @@ class ScanInfo {
     const akanConfig = await exec.getConfig();
     const tsconfig = exec.getTsConfig();
     const rootPackageJson = exec.workspace.getPackageJson();
-    const scanner = new TypeScriptDependencyScanner(exec.cwdPath, { tsconfig, rootPackageJson });
+    const gitignorePatterns = exec.workspace.getGitignorePatterns();
+    const scanner = new TypeScriptDependencyScanner(exec.cwdPath, {
+      workspaceRoot: exec.workspace.cwdPath,
+      tsconfig,
+      rootPackageJson,
+      gitignorePatterns
+    });
     const { pkgDeps, libDeps, npmDeps } = await scanner.getMonorepoDependencies(exec.name);
     const files = {
       constant: { databases: [], scalars: [] },
@@ -146,15 +152,6 @@ class ScanInfo {
         });
       })
     ]);
-    const missingLibDeps = [];
-    libDeps.forEach((libName) => {
-      if (!akanConfig.libs.includes(libName))
-        missingLibDeps.push(libName);
-    });
-    if (missingLibDeps.length)
-      throw new Error(
-        `Missing libs: ${missingLibDeps.join(", ")}, add these dependencies in akan.config.ts as { libs: [...other deps, ${missingLibDeps.join(", ")}] }`
-      );
     const scanResult = {
       name: exec.name,
       type: exec.type,
@@ -244,7 +241,7 @@ class AppInfo extends ScanInfo {
     if (this.#sortedLibs)
       return this.#sortedLibs;
     const libIndices = LibInfo.getSortedLibIndices();
-    this.#sortedLibs = this.akanConfig.libs.sort((libNameA, libNameB) => {
+    this.#sortedLibs = this.getScanResult().libDeps.sort((libNameA, libNameB) => {
       const indexA = libIndices.get(libNameA);
       const indexB = libIndices.get(libNameB);
       if (indexA === void 0 || indexB === void 0)
@@ -284,7 +281,7 @@ class LibInfo extends ScanInfo {
     if (this.#sortedLibIndices)
       return this.#sortedLibIndices;
     this.#sortedLibIndices = new Map(
-      [...this.libInfos.entries()].sort(([_, libInfoA], [__, libInfoB]) => libInfoA.akanConfig.libs.includes(libInfoB.name) ? 1 : -1).map(([libName], index) => [libName, index])
+      [...this.libInfos.entries()].sort(([_, libInfoA], [__, libInfoB]) => libInfoA.getScanResult().libDeps.includes(libInfoB.name) ? 1 : -1).map(([libName], index) => [libName, index])
     );
     return this.#sortedLibIndices;
   }
@@ -318,7 +315,7 @@ class LibInfo extends ScanInfo {
     if (this.#sortedLibs)
       return this.#sortedLibs;
     const libs = LibInfo.getSortedLibIndices();
-    this.#sortedLibs = this.akanConfig.libs.sort((libNameA, libNameB) => {
+    this.#sortedLibs = this.scanResult.libDeps.sort((libNameA, libNameB) => {
       const indexA = libs.get(libNameA);
       const indexB = libs.get(libNameB);
       if (indexA === void 0 || indexB === void 0)
@@ -331,7 +328,7 @@ class LibInfo extends ScanInfo {
     return this.#getSortedLibs();
   }
   getLibInfo(libName) {
-    if (!this.getScanResult().akanConfig.libs.includes(libName))
+    if (!this.getScanResult().libDeps.includes(libName))
       return void 0;
     const libSet = new Set(this.#getSortedLibs());
     if (!libSet.has(libName))
@@ -356,7 +353,13 @@ class PkgInfo {
   static async getScanResult(exec) {
     const tsconfig = exec.getTsConfig();
     const rootPackageJson = exec.workspace.getPackageJson();
-    const scanner = new TypeScriptDependencyScanner(exec.cwdPath, { tsconfig, rootPackageJson });
+    const gitignorePatterns = exec.workspace.getGitignorePatterns();
+    const scanner = new TypeScriptDependencyScanner(exec.cwdPath, {
+      workspaceRoot: exec.workspace.cwdPath,
+      tsconfig,
+      rootPackageJson,
+      gitignorePatterns
+    });
     const npmSet = new Set(Object.keys({ ...rootPackageJson.dependencies, ...rootPackageJson.devDependencies }));
     const pkgPathSet = new Set(
       Object.keys(tsconfig.compilerOptions.paths ?? {}).filter((path2) => tsconfig.compilerOptions.paths?.[path2]?.some((resolve) => resolve.startsWith("pkgs/"))).map((path2) => path2.replace("/*", ""))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "0.9.60-canary.0",
+  "version": "0.9.60-canary.1",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"
@@ -28,6 +28,7 @@
     "esbuild-plugin-d.ts": "^1.3.1",
     "eslint": "^9.19.0",
     "form-data": "^4.0.1",
+    "ignore": "^7.0.5",
     "ink": "^6.1.0",
     "js-yaml": "^4.1.0",
     "ora": "^3.4.0",

package/src/dependencyScanner.d.ts

@@ -4,9 +4,13 @@ export declare class TypeScriptDependencyScanner {
     private readonly directory;
     private readonly tsconfig;
     private readonly rootPackageJson;
-    constructor(directory: string, { tsconfig, rootPackageJson }: {
+    private readonly ig;
+    private readonly workspaceRoot;
+    constructor(directory: string, { workspaceRoot, tsconfig, rootPackageJson, gitignorePatterns, }: {
+        workspaceRoot: string;
         tsconfig: TsConfigJson;
         rootPackageJson: PackageJson;
+        gitignorePatterns?: string[];
     });
     getMonorepoDependencies(projectName: string): Promise<{
         pkgDeps: string[];

package/src/executors.d.ts

@@ -69,6 +69,7 @@ export declare class Executor {
         refresh?: boolean;
     }): PackageJson;
     setPackageJson(packageJson: PackageJson): void;
+    getGitignorePatterns(): string[];
     _applyTemplate({ basePath, template, scanInfo, dict, options, overwrite, }: {
         basePath: string;
         template: string;