@akanjs/devkit 0.0.126 → 0.0.128

package/cjs/src/capacitorApp.js

@@ -45,18 +45,90 @@ class CapacitorApp {
       ios: { path: "ios/App" }
     });
     await project.load();
-    if (!project.android)
-      throw new Error(`Android is not added, Please add platform first
- akan serve-android ${this.app.name}`);
-    if (!project.ios)
-      throw new Error(`iOS is not added, Please add platform first
- akan serve-ios ${this.app.name}`);
+    if (!project.android) {
+      await this.app.spawn("npx", ["cap", "add", "android"]);
+      await project.load();
+    }
+    if (!project.ios) {
+      await this.app.spawn("npx", ["cap", "add", "ios"]);
+      await project.load();
+    }
     this.project = project;
     return this;
   }
   async save() {
     await this.project.commit();
   }
+  async #prepareIos() {
+    const isAdded = import_fs.default.existsSync(`${this.app.cwdPath}/ios/App/Podfile`);
+    if (!isAdded) {
+      await this.app.spawn("npx", ["cap", "add", "ios"]);
+      await this.app.spawn("npx", ["@capacitor/assets", "generate"]);
+    } else
+      this.app.verbose(`iOS already added, skip adding process`);
+    await this.app.spawn("npx", ["cap", "sync", "ios"]);
+  }
+  async buildIos() {
+    await this.#prepareIos();
+    await this.app.spawn("npx", ["cap", "run", "ios"]);
+  }
+  async openIos() {
+    await this.app.spawn("npx", ["cap", "open", "ios"]);
+  }
+  async runIos({ operation, bundleId, version = "0.0.1", buildNum = 1 }) {
+    await this.#prepareIos();
+    this.project.ios.setBundleId("App", "Debug", bundleId);
+    this.project.ios.setBundleId("App", "Release", bundleId);
+    await this.project.ios.setVersion("App", "Debug", version);
+    await this.project.ios.setVersion("App", "Release", version);
+    await this.project.ios.setBuild("App", "Debug", buildNum);
+    await this.project.ios.setBuild("App", "Release", buildNum);
+    await this.project.commit();
+    await this.app.spawn("npx", [
+      "cross-env",
+      `APP_OPERATION_MODE=${operation}`,
+      "npx",
+      "cap",
+      "run",
+      "ios",
+      "--live-reload",
+      "--port",
+      "4201"
+    ]);
+  }
+  async #prepareAndroid() {
+    const isAdded = import_fs.default.existsSync(`${this.app.cwdPath}/android/app/build.gradle`);
+    if (!isAdded) {
+      await this.app.spawn("npx", ["cap", "add", "android"]);
+      await this.app.spawn("npx", ["@capacitor/assets", "generate"]);
+    } else
+      this.app.verbose(`Android already added, skip adding process`);
+    await this.app.spawn("npx", ["cap", "sync", "android"]);
+  }
+  async buildAndroid() {
+    await this.#prepareAndroid();
+    await this.app.spawn("npx", ["cap", "build", "android"]);
+  }
+  async openAndroid() {
+    await this.app.spawn("npx", ["cap", "open", "android"]);
+  }
+  async runAndroid({ operation, appName, bundleId, version = "0.0.1", buildNum = 1 }) {
+    await this.project.android.setVersionName(version);
+    await this.project.android.setVersionCode(buildNum);
+    await this.project.android.setPackageName(bundleId);
+    await this.project.android.setAppName(appName);
+    await this.app.spawn("npx", [
+      "cross-env",
+      `APP_OPERATION_MODE=${operation}`,
+      "npx",
+      "cap",
+      "run",
+      "android",
+      "--live-reload",
+      "--port",
+      "4201"
+    ]);
+  }
   async releaseIos() {
     const isAdded = import_fs.default.existsSync(`${this.app.cwdPath}/ios/App/Podfile`);
     if (!isAdded) {

package/cjs/src/commandDecorators/command.js

@@ -191,6 +191,8 @@ const runCommands = async (...commands) => {
               commandArgs[argMeta.idx] = await getOptionValue(argMeta, opt);
             else
               commandArgs[argMeta.idx] = await getArgumentValue(argMeta, cmdArgs[argMeta.idx], workspace);
+            if (commandArgs[argMeta.idx] instanceof import_executors.AppExecutor)
+              process.env.NEXT_PUBLIC_APP_NAME = commandArgs[argMeta.idx].name;
           }
           const cmd = new command();
           try {

package/cjs/src/executors.js

@@ -45,9 +45,11 @@ var import_promises = __toESM(require("fs/promises"));
 var import_path = __toESM(require("path"));
 var import_dependencyScanner = require("./dependencyScanner");
 class Executor {
+  name;
   logger;
   cwdPath;
   constructor(name, cwdPath) {
+    this.name = name;
     this.logger = new import_common.Logger(name);
     this.cwdPath = cwdPath;
     if (!import_fs.default.existsSync(cwdPath))
@@ -172,7 +174,7 @@ class Executor {
     this.logger.verbose(msg);
     return this;
   }
-  getTsConfig(pathname) {
+  getTsConfig(pathname = "tsconfig.json") {
     const tsconfig = this.readJson(pathname);
     if (tsconfig.extends) {
       const extendsTsconfig = this.getTsConfig(tsconfig.extends);

package/esm/src/capacitorApp.js

@@ -13,18 +13,90 @@ class CapacitorApp {
       ios: { path: "ios/App" }
     });
     await project.load();
-    if (!project.android)
-      throw new Error(`Android is not added, Please add platform first
- akan serve-android ${this.app.name}`);
-    if (!project.ios)
-      throw new Error(`iOS is not added, Please add platform first
- akan serve-ios ${this.app.name}`);
+    if (!project.android) {
+      await this.app.spawn("npx", ["cap", "add", "android"]);
+      await project.load();
+    }
+    if (!project.ios) {
+      await this.app.spawn("npx", ["cap", "add", "ios"]);
+      await project.load();
+    }
     this.project = project;
     return this;
   }
   async save() {
     await this.project.commit();
   }
+  async #prepareIos() {
+    const isAdded = fs.existsSync(`${this.app.cwdPath}/ios/App/Podfile`);
+    if (!isAdded) {
+      await this.app.spawn("npx", ["cap", "add", "ios"]);
+      await this.app.spawn("npx", ["@capacitor/assets", "generate"]);
+    } else
+      this.app.verbose(`iOS already added, skip adding process`);
+    await this.app.spawn("npx", ["cap", "sync", "ios"]);
+  }
+  async buildIos() {
+    await this.#prepareIos();
+    await this.app.spawn("npx", ["cap", "run", "ios"]);
+  }
+  async openIos() {
+    await this.app.spawn("npx", ["cap", "open", "ios"]);
+  }
+  async runIos({ operation, bundleId, version = "0.0.1", buildNum = 1 }) {
+    await this.#prepareIos();
+    this.project.ios.setBundleId("App", "Debug", bundleId);
+    this.project.ios.setBundleId("App", "Release", bundleId);
+    await this.project.ios.setVersion("App", "Debug", version);
+    await this.project.ios.setVersion("App", "Release", version);
+    await this.project.ios.setBuild("App", "Debug", buildNum);
+    await this.project.ios.setBuild("App", "Release", buildNum);
+    await this.project.commit();
+    await this.app.spawn("npx", [
+      "cross-env",
+      `APP_OPERATION_MODE=${operation}`,
+      "npx",
+      "cap",
+      "run",
+      "ios",
+      "--live-reload",
+      "--port",
+      "4201"
+    ]);
+  }
+  async #prepareAndroid() {
+    const isAdded = fs.existsSync(`${this.app.cwdPath}/android/app/build.gradle`);
+    if (!isAdded) {
+      await this.app.spawn("npx", ["cap", "add", "android"]);
+      await this.app.spawn("npx", ["@capacitor/assets", "generate"]);
+    } else
+      this.app.verbose(`Android already added, skip adding process`);
+    await this.app.spawn("npx", ["cap", "sync", "android"]);
+  }
+  async buildAndroid() {
+    await this.#prepareAndroid();
+    await this.app.spawn("npx", ["cap", "build", "android"]);
+  }
+  async openAndroid() {
+    await this.app.spawn("npx", ["cap", "open", "android"]);
+  }
+  async runAndroid({ operation, appName, bundleId, version = "0.0.1", buildNum = 1 }) {
+    await this.project.android.setVersionName(version);
+    await this.project.android.setVersionCode(buildNum);
+    await this.project.android.setPackageName(bundleId);
+    await this.project.android.setAppName(appName);
+    await this.app.spawn("npx", [
+      "cross-env",
+      `APP_OPERATION_MODE=${operation}`,
+      "npx",
+      "cap",
+      "run",
+      "android",
+      "--live-reload",
+      "--port",
+      "4201"
+    ]);
+  }
   async releaseIos() {
     const isAdded = fs.existsSync(`${this.app.cwdPath}/ios/App/Podfile`);
     if (!isAdded) {

package/esm/src/commandDecorators/command.js

@@ -159,6 +159,8 @@ const runCommands = async (...commands) => {
               commandArgs[argMeta.idx] = await getOptionValue(argMeta, opt);
             else
               commandArgs[argMeta.idx] = await getArgumentValue(argMeta, cmdArgs[argMeta.idx], workspace);
+            if (commandArgs[argMeta.idx] instanceof AppExecutor)
+              process.env.NEXT_PUBLIC_APP_NAME = commandArgs[argMeta.idx].name;
           }
           const cmd = new command();
           try {

package/esm/src/executors.js

@@ -12,9 +12,11 @@ import fsPromise from "fs/promises";
 import path from "path";
 import { TypeScriptDependencyScanner } from "./dependencyScanner";
 class Executor {
+  name;
   logger;
   cwdPath;
   constructor(name, cwdPath) {
+    this.name = name;
     this.logger = new Logger(name);
     this.cwdPath = cwdPath;
     if (!fs.existsSync(cwdPath))
@@ -139,7 +141,7 @@ class Executor {
     this.logger.verbose(msg);
     return this;
   }
-  getTsConfig(pathname) {
+  getTsConfig(pathname = "tsconfig.json") {
     const tsconfig = this.readJson(pathname);
     if (tsconfig.extends) {
       const extendsTsconfig = this.getTsConfig(tsconfig.extends);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "0.0.126",
+  "version": "0.0.128",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/src/capacitorApp.d.ts

@@ -2,6 +2,13 @@ import type { AppExecutor } from "@akanjs/devkit";
 import { MobileProject } from "@trapezedev/project";
 import type { AndroidProject } from "@trapezedev/project/dist/android/project";
 import type { IosProject } from "@trapezedev/project/dist/ios/project";
+interface RunConfig {
+    operation: "local" | "release";
+    appName: string;
+    bundleId: string;
+    version?: string;
+    buildNum?: number;
+}
 export declare class CapacitorApp {
     #private;
     private readonly app;
@@ -13,9 +20,16 @@ export declare class CapacitorApp {
     constructor(app: AppExecutor);
     init(): Promise<this>;
     save(): Promise<void>;
+    buildIos(): Promise<void>;
+    openIos(): Promise<void>;
+    runIos({ operation, bundleId, version, buildNum }: RunConfig): Promise<void>;
+    buildAndroid(): Promise<void>;
+    openAndroid(): Promise<void>;
+    runAndroid({ operation, appName, bundleId, version, buildNum }: RunConfig): Promise<void>;
     releaseIos(): Promise<void>;
     releaseAndroid(): Promise<void>;
     addCamera(): Promise<void>;
     addContact(): Promise<void>;
     addLocation(): Promise<void>;
 }
+export {};

package/src/executors.d.ts

@@ -4,6 +4,7 @@ import { type ExecOptions, type ForkOptions, type SpawnOptions } from "child_pro
 import type { PackageJson, TsConfigJson } from "./types";
 export declare class Executor {
     #private;
+    name: string;
     logger: Logger;
     cwdPath: string;
     constructor(name: string, cwdPath: string);
@@ -28,7 +29,7 @@ export declare class Executor {
     cp(srcPath: string, destPath: string): Promise<void>;
     log(msg: string): this;
     verbose(msg: string): this;
-    getTsConfig(pathname: string): TsConfigJson;
+    getTsConfig(pathname?: string): TsConfigJson;
     applyTemplate({ basePath, template, scanResult, dict, overwrite, }: {
         basePath: string;
         template: string;
@@ -52,7 +53,7 @@ export declare class WorkspaceExecutor extends Executor {
     getBaseDevEnv(): {
         repoName: string;
         serveDomain: string;
-        env: "debug" | "testing" | "local" | "develop" | "main";
+        env: "testing" | "local" | "debug" | "develop" | "main";
         name?: string | undefined;
     };
     scan(): Promise<WorkspaceScanResult>;