@pi-r/android 0.8.2 → 0.9.0

package/extensions/app/manifest/index.js

@@ -1,5 +1,5 @@
 "use strict";
-const path = require("path");
+const path = require("node:path");
 const htmlparser2 = require("htmlparser2");
 const domhandler = require("domhandler");
 const domutils = require("domutils");
@@ -19,7 +19,7 @@ function finalize(instance) {
     if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
         const { supportsRtl, label, theme, activity, metaData = [], activityName, fontProvider } = manifest.application || {};
         const profileable = config.profileable;
-        let modified;
+        let modified = false;
         if (!existing) {
             source = (0, util_1.replaceAll)(source, (name) => {
                 switch (name) {

package/extensions/gradle/dependencies/index.js

@@ -1,6 +1,6 @@
 "use strict";
-const path = require("path");
-const fs = require("fs");
+const path = require("node:path");
+const fs = require("node:fs");
 const Document = require("@e-mc/document");
 const types_1 = require("@e-mc/types");
 const util_1 = require("@e-mc/document/util");
@@ -99,7 +99,7 @@ function finalize(instance) {
     let { localUri, source, existing, kotlin = false, language } = instance.findTemplate(path.join(this.baseDirectory, mainParentDir), "build.gradle", { detect: instance.detect(this), languageOf: 'gradle' });
     if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
         const javaVersion = instance.config.javaVersion;
-        let jvmTarget, modified;
+        let jvmTarget, modified = false;
         const upgrade = javaVersion > 0;
         const setModified = (output) => {
             if (output !== source) {
@@ -138,7 +138,7 @@ function finalize(instance) {
                         continue;
                     }
                     if (target.dependencies) {
-                        let found;
+                        let found = false;
                         for (const { groupId, artifactId, version, scope } of target.dependencies) {
                             if (scope && (dependencyScopes === true || dependencyScopes === 1 || hasScope(scope))) {
                                 let type = -1;
@@ -225,9 +225,9 @@ function finalize(instance) {
                 const newLine = source.includes('\r\n') ? '\r\n' : '\n';
                 const gradleDir = path.join(this.baseDirectory, 'gradle');
                 const template = instance.findTemplate(gradleDir, "libs.versions.toml", { detect: true, subDir: kotlin ? 'kotlin' : undefined, throwsDoesNotExist: false });
-                let content = match[1], named = false, versioning, indent;
+                let content = match[1], named = false, versioning = false, indent;
                 if (template.localUri && template.source) {
-                    versioning = kotlin && versionCatalog !== false || versionCatalog;
+                    versioning = kotlin && versionCatalog !== false || !!versionCatalog;
                     if (versioning || template.existing) {
                         const libraries = {};
                         const versions = {};
@@ -424,11 +424,11 @@ function finalize(instance) {
                     output = Document.updateGradle(output, ['android', 'buildFeatures'], 'compose = true');
                 }
                 else {
-                    const stdLib = instance.findVersion('org.jetbrains.kotlin:kotlin-stdlib', "2.0.20");
+                    const stdLib = instance.findVersion('org.jetbrains.kotlin:kotlin-stdlib', "2.1.0");
                     output = Document.updateGradle(output, ['plugins'], "id 'org.jetbrains.kotlin.android'", { upgrade: true, multiple: true, addendum: `version '${stdLib}'` });
                     output = Document.updateGradle(output, ['android', 'buildFeatures'], "compose true");
                     if (stdLib.startsWith('1.')) {
-                        output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.5.14")}'`, true);
+                        output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.5.15")}'`, true);
                     }
                     if (upgrade) {
                         output = Document.updateGradle(output, ['android', 'kotlinOptions'], `jvmTarget = '${javaVersion}'`, true);
@@ -470,7 +470,7 @@ function finalize(instance) {
             let output = source;
             if (targetAPI) {
                 const values = typeof targetAPI === 'string' ? [`"android-${targetAPI}"`, `"${targetAPI}"`] : [targetAPI, targetAPI];
-                const updateOnly = +targetAPI >= 31;
+                const updateOnly = +targetAPI >= +"33";
                 let revised = Document.updateGradle(output, ['android'], kotlin ? `compileSdkVersion(${values[0]})` : 'compileSdkVersion ' + values[0], { upgrade: true, updateOnly });
                 if (revised === output) {
                     output = Document.updateGradle(output, ['android'], kotlin ? `compileSdk(${values[0]})` : 'compileSdk ' + values[0], true);

package/extensions/gradle/settings/index.js

@@ -1,7 +1,7 @@
 "use strict";
-const path = require("path");
-const util_1 = require("@e-mc/document/util");
+const path = require("node:path");
 const parse_1 = require("@e-mc/document/parse");
+const util_1 = require("@e-mc/document/util");
 function finalize(instance) {
     const { dependencies, projectName, mainParentDir } = instance.config;
     if (!dependencies && !projectName) {
@@ -10,7 +10,7 @@ function finalize(instance) {
     let { localUri, source, existing, kotlin } = instance.findTemplate(this.baseDirectory, "settings.gradle", { detect: instance.detect(this), languageOf: 'gradle' });
     if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
         const targetName = projectName?.replace(/"/g, '\\"');
-        let modified;
+        let modified = false;
         if (existing) {
             let match;
             if (dependencies) {

package/extensions/task/index.js

@@ -1,7 +1,7 @@
 "use strict";
-const path = require("path");
-const fs = require("fs");
-const child_process = require("child_process");
+const path = require("node:path");
+const fs = require("node:fs");
+const child_process = require("node:child_process");
 const which = require("which");
 const Document = require("@e-mc/document");
 const types_1 = require("@e-mc/types");
@@ -28,15 +28,16 @@ async function finalize(instance) {
     }
     const settings = instance.settings.extensions?.task || {};
     const exec = settings.exec;
-    let { broadcastId, baseDirectory } = this, command = settings.command, uid, gid, title, filename, altname, foundDir;
+    let { broadcastId, baseDirectory } = this, command = settings.command, uid, gid, title, filename, altname, foundDir = false;
     if (command) {
+        command = path.normalize(command);
         if (command.includes('mvn')) {
             title = "maven";
         }
         else {
-            title = /([^\\/]+?)(?:\.[a-z]+)?$/i.exec(command)?.[1] || 'spawn';
+            title = new RegExp(`([^${path.sep === '\\' ? '\\\\' : '/'}]+?)(?:\\.[a-z]+)?$`, 'i').exec(command)?.[1] || 'spawn';
         }
-        if (!/[\\/]/.test(command = path.normalize(command))) {
+        if (!command.includes(path.sep)) {
             filename = checkWin32(command);
         }
         command = Document.sanitizeCmd(command);

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
-const fs = require("fs");
-const path = require("path");
+const fs = require("node:fs");
+const path = require("node:path");
 const types_1 = require("@e-mc/types");
 const Document = require('@e-mc/document');
 class AndroidDocument extends Document {
@@ -10,9 +10,9 @@ class AndroidDocument extends Document {
         }
         if (instance.extensions.length > 0) {
             const config = instance.config;
-            const mainActivityFile = config.mainActivityFile;
-            if (mainActivityFile && !path.isAbsolute(mainActivityFile)) {
-                let pathname = /[\\/]/.test(mainActivityFile) && path.join(this.baseDirectory, mainActivityFile);
+            let mainActivityFile = config.mainActivityFile;
+            if (mainActivityFile && !path.isAbsolute(mainActivityFile = path.normalize(mainActivityFile))) {
+                let pathname = mainActivityFile.includes(path.sep) && path.join(this.baseDirectory, mainActivityFile);
                 if (pathname && Document.isPath(pathname)) {
                     config.mainActivityFile = pathname;
                 }
@@ -188,7 +188,7 @@ class AndroidDocument extends Document {
         if (options) {
             ({ detect, languageOf, subDir } = options);
         }
-        let kotlin, language;
+        let kotlin = false, language;
         if (languageOf) {
             kotlin = (language = this.languageOf(languageOf)) === 'kotlin';
             if (detect !== false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/android",
-  "version": "0.8.2",
+  "version": "0.9.0",
   "description": "Android document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -14,16 +14,18 @@
   },
   "keywords": [
     "squared",
-    "e-mc",
-    "squared-functions"
+    "e-mc"
   ],
   "author": "An Pham <anpham6@gmail.com>",
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/document": "^0.10.2",
-    "@e-mc/types": "^0.10.2",
+    "@e-mc/document": "^0.11.0",
+    "@e-mc/types": "^0.11.0",
+    "dom-serializer": "*",
+    "domhandler": "*",
+    "domutils": "*",
     "htmlparser2": "^9.1.0",
-    "which": "^2.0.2"
+    "which": "^4.0.0"
   }
 }

package/template/java/static/build.gradle

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

package/template/java+kotlin/build.gradle

@@ -25,19 +25,19 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
     buildFeatures {
-        viewBinding false
+        viewBinding true
     }
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.core:core-ktx:1.15.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'

package/template/java+kotlin/settings.gradle

@@ -1,6 +1,12 @@
 pluginManagement {
     repositories {
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
         gradlePluginPortal()
     }

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

@@ -1,5 +1,5 @@
-plugins {
-    id 'com.android.application' version '8.5.2' apply false
-    id 'com.android.library' version '8.5.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.25' apply false
+plugins {
+    id 'com.android.application' version '8.7.3' apply false
+    id 'com.android.library' version '8.7.3' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
 }

package/template/kotlin/build.gradle.kts

@@ -34,8 +34,8 @@ android {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 dependencies {

package/template/kotlin/libs.versions.toml

@@ -1,23 +1,23 @@
-[versions]
-agp = "8.5.2"
-kotlin = "2.0.20"
-coreKtx = "1.13.1"
-junit = "4.13.2"
-junitVersion = "1.2.1"
-espressoCore = "3.6.1"
-appcompat = "1.7.0"
-constraintlayout = "2.1.4"
-
-[libraries]
-androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
-jetbrains-kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
-androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
-androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
-androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
-
-[plugins]
-android-application = { id = "com.android.application", version.ref = "agp" }
-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-jetbrains-kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+[versions]
+agp = "8.7.3"
+kotlin = "2.1.0"
+coreKtx = "1.15.0"
+junit = "4.13.2"
+junitVersion = "1.2.1"
+espressoCore = "3.6.1"
+appcompat = "1.7.0"
+constraintlayout = "2.2.0"
+
+[libraries]
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+jetbrains-kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
+androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+jetbrains-kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

package/template/kotlin/settings.gradle.kts

@@ -2,7 +2,13 @@ val snapshotVersion : String? = System.getenv("ANDROIDX_SNAPSHOT_ID")
 
 pluginManagement {
     repositories {
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
         gradlePluginPortal()
     }

package/types/index.d.ts

@@ -1,80 +1,80 @@
-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, FinalizedElement } from './squared';
-
-interface DocumentDirectory extends IDocumentDirectory {
-    template?: string;
-    project?: string;
-}
-
-interface AndroidDocumentSettings extends Pick<IDocumentSettings, "users" | "directory">, PlainObject {
-    extensions?: {
-        task?: {
-            exec?: ExecAction;
-            command?: string;
-        };
-    };
-    language?: {
-        [T in LanguageOfType]?: LanguageType;
-    };
-}
-
-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?: LanguageType;
-}
-
-export interface FindTemplateOptions {
-    detect?: boolean;
-    languageOf?: LanguageOfType;
-    subDir?: ArrayOf<string>;
-    throwsDoesNotExist?: boolean;
-}
-
-export interface MavenArtifact {
-    groupId: string;
-    artifactId: string;
-    version: string;
-    scope?: DependencyScopes;
-    dependencies?: MavenArtifact[];
-}
-
-export type LanguageType = "java" | "kotlin" | "java+kotlin";
-export type LanguageOfType = "gradle";
-export type DocumentAsset = ExternalAsset;
-
-export interface IAndroidDocument<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends IDocument<T, U, DocumentModule>, 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>;
-    languageOf(name: LanguageOfType, value?: LanguageType): Undef<LanguageType>;
-    detectKts(...paths: string[]): Null<boolean>;
-    detect(host?: T): boolean;
-    get settings(): AndroidDocumentSettings;
-}
-
-export interface AndroidDocumentConstructor<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends ConstructorDerived<DocumentConstructor<T, U>> {
-    readonly prototype: IAndroidDocument<T, U>;
-    new(module?: DocumentModule, ...args: unknown[]): IAndroidDocument<T, U>;
+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, FinalizedElement } from './squared';
+
+interface DocumentDirectory extends IDocumentDirectory {
+    template?: string;
+    project?: string;
+}
+
+interface AndroidDocumentSettings extends Pick<IDocumentSettings, "users" | "directory">, PlainObject {
+    extensions?: {
+        task?: {
+            exec?: ExecAction;
+            command?: string;
+        };
+    };
+    language?: {
+        [T in LanguageOfType]?: LanguageType;
+    };
+}
+
+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?: LanguageType;
+}
+
+export interface FindTemplateOptions {
+    detect?: boolean;
+    languageOf?: LanguageOfType;
+    subDir?: string | string[];
+    throwsDoesNotExist?: boolean;
+}
+
+export interface MavenArtifact {
+    groupId: string;
+    artifactId: string;
+    version: string;
+    scope?: DependencyScopes;
+    dependencies?: MavenArtifact[];
+}
+
+export type LanguageType = "java" | "kotlin" | "java+kotlin";
+export type LanguageOfType = "gradle";
+export type DocumentAsset = ExternalAsset;
+
+export interface IAndroidDocument<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends IDocument<T, U, DocumentModule>, Pick<DocumentOutput, DocumentProperties> {
+    config: UserConfig;
+    elements: FinalizedElement[];
+    extensionData: PlainObject;
+    findTemplate(baseDir: string, filename: string, options?: FindTemplateOptions): TemplateData;
+    findData<V = AnyObject>(filename: string, format?: string): V | null;
+    languageOf(name: LanguageOfType, value?: LanguageType): LanguageType | undefined;
+    detectKts(...paths: string[]): boolean | null;
+    detect(host?: T): boolean;
+    get settings(): AndroidDocumentSettings;
+}
+
+export interface AndroidDocumentConstructor<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends ConstructorDerived<DocumentConstructor<T, U>> {
+    readonly prototype: IAndroidDocument<T, U>;
+    new(module?: DocumentModule, ...args: unknown[]): IAndroidDocument<T, U>;
 }