@pi-r/android 0.7.2 → 0.7.4

package/index.d.ts

@@ -1,7 +1,7 @@
-import type { IFileManager } from '@e-mc/types/lib';
-
-import type { AndroidDocumentConstructor } from './types';
-
-declare const Android: AndroidDocumentConstructor<IFileManager>;
-
+import type { IFileManager } from '@e-mc/types/lib';
+
+import type { AndroidDocumentConstructor } from './types';
+
+declare const Android: AndroidDocumentConstructor<IFileManager>;
+
 export = Android;

package/index.js

@@ -4,6 +4,30 @@ const path = require("path");
 const types_1 = require("@e-mc/types");
 const Document = require('@e-mc/document');
 class AndroidDocument extends Document {
+    constructor() {
+        super(...arguments);
+        this.config = {
+            mainParentDir: 'app',
+            mainSrcDir: 'src/main',
+            mainActivityFile: '',
+            javaVersion: 0,
+            dataBinding: false,
+            projectName: undefined,
+            versionName: undefined,
+            versionCode: 0,
+            manifest: undefined,
+            namespace: undefined,
+            applicationId: undefined,
+            profileable: undefined,
+            dependencies: undefined,
+            dependencyScopes: undefined,
+            commands: undefined
+        };
+        this.elements = [];
+        this.extensionData = {};
+        this._moduleName = 'android';
+        this._threadable = true;
+    }
     static async finalize(instance) {
         if (instance.aborted) {
             return (0, types_1.createAbortError)(true);
@@ -30,29 +54,6 @@ class AndroidDocument extends Document {
         }
         return super.finalize.call(this, instance);
     }
-    config = {
-        mainParentDir: 'app',
-        mainSrcDir: 'src/main',
-        mainActivityFile: '',
-        javaVersion: 0,
-        dataBinding: false,
-        projectName: undefined,
-        versionName: undefined,
-        versionCode: 0,
-        manifest: undefined,
-        namespace: undefined,
-        applicationId: undefined,
-        profileable: undefined,
-        dependencies: undefined,
-        dependencyScopes: undefined,
-        commands: undefined
-    };
-    elements = [];
-    extensionData = {};
-    targetAPI;
-    directories;
-    _moduleName = 'android';
-    _threadable = true;
     init(assets, config) {
         if (config) {
             const { targetAPI, mainParentDir, mainSrcDir, mainActivityFile, javaVersion, projectName, versionName, versionCode = 0, manifest, namespace, applicationId, profileable, dependencies, dependencyScopes, dataBinding, commands, directories, elements, extensionData } = config;

package/package.json

@@ -1,28 +1,28 @@
-{
-  "name": "@pi-r/android",
-  "version": "0.7.2",
-  "description": "Android document constructor for E-mc.",
-  "main": "index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/pi-r.git",
-    "directory": "src/module/android"
-  },
-  "keywords": [
-    "squared",
-    "e-mc",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "MIT",
-  "homepage": "https://github.com/anpham6/pi-r#readme",
-  "dependencies": {
-    "@e-mc/document": "^0.9.4",
-    "@e-mc/types": "^0.9.4",
-    "htmlparser2": "^9.1.0",
-    "which": "^2.0.2"
-  }
-}
+{
+  "name": "@pi-r/android",
+  "version": "0.7.4",
+  "description": "Android document constructor for E-mc.",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
+    "directory": "src/module/android"
+  },
+  "keywords": [
+    "squared",
+    "e-mc",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/anpham6/pi-r#readme",
+  "dependencies": {
+    "@e-mc/document": "^0.9.12",
+    "@e-mc/types": "^0.9.12",
+    "htmlparser2": "^9.1.0",
+    "which": "^2.0.2"
+  }
+}

package/template/AndroidManifest.xml

@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="{{label}}"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="{{supportsRtl}}"
-        android:theme="{{theme}}">
-        <activity
-            android:name="{{activityName}}"
-            android:exported="true"
-            android:label="{{label}}"
-            android:theme="{{theme}}">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <profileable android:shell="true" android:enabled="{{profileable}}" />
-    </application>
-
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="{{label}}"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="{{supportsRtl}}"
+        android:theme="{{theme}}">
+        <activity
+            android:name="{{activityName}}"
+            android:exported="true"
+            android:label="{{label}}"
+            android:theme="{{theme}}">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <profileable android:shell="true" android:enabled="{{profileable}}" />
+    </application>
+
 </manifest>

package/template/java/build.gradle

@@ -1,39 +1,39 @@
-plugins {
-    id 'com.android.application'
-}
-
-android {
-    namespace ''
-    compileSdk 34
-
-    defaultConfig {
-        applicationId ''
-        minSdk 21
-        targetSdk 34
-        versionCode 1
-        versionName '1.0'
-
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-    }
-    buildTypes {
-        release {
-            debuggable false
-            minifyEnabled true
-            shrinkResources false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    buildFeatures {
-        viewBinding false
-    }
-}
-
-dependencies {
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+plugins {
+    id 'com.android.application'
+}
+
+android {
+    namespace ''
+    compileSdk 34
+
+    defaultConfig {
+        applicationId ''
+        minSdk 21
+        targetSdk 34
+        versionCode 1
+        versionName '1.0'
+
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+    }
+    buildTypes {
+        release {
+            debuggable false
+            minifyEnabled true
+            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    buildFeatures {
+        viewBinding false
+    }
+}
+
+dependencies {
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }

package/template/java/static/build.gradle

@@ -1,4 +1,4 @@
-plugins {
-    id 'com.android.application' version '8.4.0' apply false
-    id 'com.android.library' version '8.4.0' apply false
+plugins {
+    id 'com.android.application' version '8.4.0' apply false
+    id 'com.android.library' version '8.4.0' apply false
 }

package/template/java+kotlin/build.gradle

@@ -1,44 +1,44 @@
-plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
-}
-
-android {
-    namespace ''
-    compileSdk 34
-
-    defaultConfig {
-        applicationId ''
-        minSdk 21
-        targetSdk 34
-        versionCode 1
-        versionName '1.0'
-
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-    }
-    buildTypes {
-        release {
-            debuggable false
-            minifyEnabled true
-            shrinkResources false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-    buildFeatures {
-        viewBinding false
-    }
-}
-
-dependencies {
-    implementation 'androidx.core:core-ktx:1.13.1'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    namespace ''
+    compileSdk 34
+
+    defaultConfig {
+        applicationId ''
+        minSdk 21
+        targetSdk 34
+        versionCode 1
+        versionName '1.0'
+
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+    }
+    buildTypes {
+        release {
+            debuggable false
+            minifyEnabled true
+            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    buildFeatures {
+        viewBinding false
+    }
+}
+
+dependencies {
+    implementation 'androidx.core:core-ktx:1.13.1'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }

package/template/java+kotlin/static/build.gradle

@@ -1,5 +1,5 @@
-plugins {
-    id 'com.android.application' version '8.4.0' apply false
-    id 'com.android.library' version '8.4.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.24' apply false
+plugins {
+    id 'com.android.application' version '8.4.0' apply false
+    id 'com.android.library' version '8.4.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.24' apply false
 }

package/template/kotlin/build.gradle.kts

@@ -1,46 +1,46 @@
-plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-}
-
-android {
-    namespace = ""
-    compileSdk = 34
-
-    defaultConfig {
-        applicationId = ""
-        minSdk = 21
-        targetSdk = 34
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-    buildTypes {
-        release {
-            isDebuggable = false
-            isMinifyEnabled = true
-            isShrinkResources = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
-        }
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        viewBinding = true
-    }
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.24")
-    implementation("androidx.core:core-ktx:1.13.1")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = ""
+    compileSdk = 34
+
+    defaultConfig {
+        applicationId = ""
+        minSdk = 21
+        targetSdk = 34
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            isDebuggable = false
+            isMinifyEnabled = true
+            isShrinkResources = false
+            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+        }
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    buildFeatures {
+        viewBinding = true
+    }
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+dependencies {
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.24")
+    implementation("androidx.core:core-ktx:1.13.1")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
 }

package/template/kotlin/settings.gradle.kts

@@ -1,18 +1,18 @@
-pluginManagement {
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-rootProject.name = "{{projectName}}"
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.name = "{{projectName}}"
 include("{{name}}")

package/template/kotlin/static/build.gradle.kts

@@ -1,5 +1,5 @@
-plugins {
-    id("com.android.application") version "8.4.0" apply false
-    id("com.android.library") version "8.4.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.24" apply false
+plugins {
+    id("com.android.application") version "8.4.0" apply false
+    id("com.android.library") version "8.4.0" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.24" apply false
 }

package/types/index.d.ts

@@ -1,77 +1,77 @@
-import type { FinalizedElement } from '@e-mc/types/lib/squared';
-
-import type { DocumentConstructor, IDocument, IFileManager } from '@e-mc/types/lib';
-import type { ExternalAsset } from '@e-mc/types/lib/asset';
-import type { ExecAction, DocumentDirectory as IDocumentDirectory, DocumentModule as IDocumentModule, DocumentSettings as IDocumentSettings } from '@e-mc/types/lib/settings';
-
-import type { DependencyScopes, DocumentOutput } from './squared';
-
-interface DocumentDirectory extends IDocumentDirectory {
-    template?: string;
-}
-
-interface AndroidDocumentSettings extends Pick<IDocumentSettings, "users" | "directory">, PlainObject {
-    extensions?: {
-        task?: {
-            exec?: ExecAction;
-            command?: string;
-        };
-    };
-    language?: {
-        gradle?: "java" | "kotlin" | "java+kotlin";
-    };
-}
-
-type LanguageType = "gradle";
-type DocumentProperties = "targetAPI" | "elements" | "extensionData" | "directories";
-
-export interface UserConfig extends Omit<DocumentOutput, DocumentProperties> {
-    mainParentDir: string;
-    mainSrcDir: string;
-    mainActivityFile: string;
-    javaVersion: number;
-    dataBinding: boolean;
-}
-
-export interface DocumentModule extends IDocumentModule {
-    settings?: AndroidDocumentSettings;
-}
-
-export interface TemplateData {
-    localUri?: string;
-    source?: string;
-    existing?: boolean;
-    kotlin?: boolean;
-    language?: string;
-}
-
-export interface FindTemplateOptions {
-    detect?: boolean;
-    languageOf?: LanguageType;
-    subDir?: ArrayOf<string>;
-}
-
-export interface MavenArtifact {
-    groupId: string;
-    artifactId: string;
-    version: string;
-    scope?: DependencyScopes;
-    dependencies?: MavenArtifact[];
-}
-
-export interface IAndroidDocument<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends IDocument<T, U>, Pick<DocumentOutput, DocumentProperties> {
-    config: UserConfig;
-    elements: FinalizedElement[];
-    extensionData: PlainObject;
-    findTemplate(baseDir: string, filename: string, options?: FindTemplateOptions): TemplateData;
-    findData<V = AnyObject>(filename: string, format?: string): Null<V>;
-    detectKts(...paths: string[]): Null<boolean>;
-    get settings(): AndroidDocumentSettings;
-}
-
-export interface AndroidDocumentConstructor<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends DocumentConstructor<T, U> {
-    readonly prototype: IAndroidDocument<T, U>;
-    new(module?: DocumentModule, ...args: unknown[]): IAndroidDocument<T, U>;
-}
-
+import type { FinalizedElement } from '@e-mc/types/lib/squared';
+
+import type { DocumentConstructor, IDocument, IFileManager } from '@e-mc/types/lib';
+import type { ExternalAsset } from '@e-mc/types/lib/asset';
+import type { ExecAction, DocumentDirectory as IDocumentDirectory, DocumentModule as IDocumentModule, DocumentSettings as IDocumentSettings } from '@e-mc/types/lib/settings';
+
+import type { DependencyScopes, DocumentOutput } from './squared';
+
+interface DocumentDirectory extends IDocumentDirectory {
+    template?: string;
+}
+
+interface AndroidDocumentSettings extends Pick<IDocumentSettings, "users" | "directory">, PlainObject {
+    extensions?: {
+        task?: {
+            exec?: ExecAction;
+            command?: string;
+        };
+    };
+    language?: {
+        gradle?: "java" | "kotlin" | "java+kotlin";
+    };
+}
+
+type LanguageType = "gradle";
+type DocumentProperties = "targetAPI" | "elements" | "extensionData" | "directories";
+
+export interface UserConfig extends Omit<DocumentOutput, DocumentProperties> {
+    mainParentDir: string;
+    mainSrcDir: string;
+    mainActivityFile: string;
+    javaVersion: number;
+    dataBinding: boolean;
+}
+
+export interface DocumentModule extends IDocumentModule {
+    settings?: AndroidDocumentSettings;
+}
+
+export interface TemplateData {
+    localUri?: string;
+    source?: string;
+    existing?: boolean;
+    kotlin?: boolean;
+    language?: string;
+}
+
+export interface FindTemplateOptions {
+    detect?: boolean;
+    languageOf?: LanguageType;
+    subDir?: ArrayOf<string>;
+}
+
+export interface MavenArtifact {
+    groupId: string;
+    artifactId: string;
+    version: string;
+    scope?: DependencyScopes;
+    dependencies?: MavenArtifact[];
+}
+
+export interface IAndroidDocument<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends IDocument<T, U>, Pick<DocumentOutput, DocumentProperties> {
+    config: UserConfig;
+    elements: FinalizedElement[];
+    extensionData: PlainObject;
+    findTemplate(baseDir: string, filename: string, options?: FindTemplateOptions): TemplateData;
+    findData<V = AnyObject>(filename: string, format?: string): Null<V>;
+    detectKts(...paths: string[]): Null<boolean>;
+    get settings(): AndroidDocumentSettings;
+}
+
+export interface AndroidDocumentConstructor<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends DocumentConstructor<T, U> {
+    readonly prototype: IAndroidDocument<T, U>;
+    new(module?: DocumentModule, ...args: unknown[]): IAndroidDocument<T, U>;
+}
+
 export type DocumentAsset = ExternalAsset;