@pi-r/android 0.2.2 → 0.3.1

package/extensions/app/manifest/index.js

@@ -21,14 +21,14 @@ function finalize(instance) {
         const profileable = config.profileable;
         let modified;
         if (!existing) {
-            source = (0, util_1.replaceAll)(source.replace(manifestPackage ? '{{package}}' : ' package="{{package}}"', manifestPackage || ''), (name) => {
+            source = (0, util_1.replaceAll)(source, (name) => {
                 switch (name) {
                     case 'supportsRtl':
                         return supportsRtl === false ? 'false' : 'true';
                     case 'label':
                         return '@string/' + (label || 'app_name');
                     case 'theme':
-                        return theme ? '@style/' + theme : '';
+                        return '@style/' + (theme || 'Theme.Android2');
                     case 'activityName':
                         return activityName || '';
                     case 'profileable':
@@ -46,7 +46,7 @@ function finalize(instance) {
                 }
                 let target = null;
                 if (manifestPackage && (target = domutils.findOne(elem => elem.tagName === 'manifest', dom, true))) {
-                    target.attribs['package'] = manifestPackage;
+                    target.attribs.package = manifestPackage;
                     modified = true;
                 }
                 if (target = domutils.findOne(elem => elem.tagName === 'application', dom, true)) {
@@ -142,26 +142,27 @@ function finalize(instance) {
                     return;
                 }
                 const app = domutils.findOne(elem => elem.tagName === 'application', dom, true);
-                if (app) {
-                    for (const { name, resource, value } of metaData) {
-                        if (name && (resource || value)) {
-                            let item = domutils.findOne(elem => elem.tagName === 'meta-data' && elem.attribs['android:name'] === name, app.childNodes);
-                            if (!item) {
-                                domutils.appendChild(app, item = new domhandler.Element('meta-data', { 'android:name': name }));
-                                domutils.append(item, new domhandler.Text('\n'));
-                            }
-                            else if (item.attribs['android:resource'] === resource || item.attribs['android:value'] === value) {
-                                continue;
-                            }
-                            if (resource) {
-                                item.attribs['android:resource'] = resource;
-                            }
-                            if (value) {
-                                item.attribs['android:value'] = value;
-                            }
-                            source = domserializer.default(dom, { xmlMode: true });
-                            modified = true;
+                if (!app) {
+                    return;
+                }
+                for (const { name, resource, value } of metaData) {
+                    if (name && (resource || value)) {
+                        let item = domutils.findOne(elem => elem.tagName === 'meta-data' && elem.attribs['android:name'] === name, app.childNodes);
+                        if (!item) {
+                            domutils.appendChild(app, item = new domhandler.Element('meta-data', { 'android:name': name }));
+                            domutils.append(item, new domhandler.Text('\n'));
                         }
+                        else if (item.attribs['android:resource'] === resource || item.attribs['android:value'] === value) {
+                            continue;
+                        }
+                        if (resource) {
+                            item.attribs['android:resource'] = resource;
+                        }
+                        if (value) {
+                            item.attribs['android:value'] = value;
+                        }
+                        source = domserializer.default(dom, { xmlMode: true });
+                        modified = true;
                     }
                 }
             }), { xmlMode: true, decodeEntities: false }).end(source);

package/extensions/gradle/dependencies/index.js

@@ -10,7 +10,8 @@ function finalize(instance) {
     if (!profileable && !dependencies && !dataBinding && !versionName && !versionCode && !config.namespace) {
         return;
     }
-    let { localUri, source, existing, kotlin } = instance.findTemplate(path.join(this.baseDirectory, config.mainParentDir), 'build.gradle', { detect: this.incremental !== 'staging', languageOf: 'gradle' });
+    const detect = this.incremental !== 'staging';
+    let { localUri, source, existing, kotlin } = instance.findTemplate(path.join(this.baseDirectory, config.mainParentDir), "build.gradle" /* GRADLE.FILENAME */, { detect, languageOf: 'gradle' });
     if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
         let { namespace, javaVersion } = config, jvmTarget, modified;
         const upgrade = javaVersion > 0;
@@ -25,7 +26,7 @@ function finalize(instance) {
             if (!kotlin && items.some(value => value[1].endsWith('-ktx'))) {
                 setModified(Document.updateGradle(source, ['plugins'], "id 'kotlin-android'", { multiple: true }));
             }
-            const match = /dependencies\s+\{([^}]+)\}/.exec(source);
+            const match = /dependencies\s+\{((?:{[^}]*}|(?![{}])[\S\s])+)\}/.exec(source);
             if (match) {
                 const writeImpl = (item) => 'implementation' + (kotlin ? `("${item.join(':')}")` : ` '${item.join(':')}'`);
                 const pattern = kotlin ? /([ \t]*)implementation\((?:\s*"([^"]+)"\s*\))?/g : /([ \t]*)implementation(?:\s*\(?\s*["']([^"']+)["']\s*\)?|\s+((?:\s*(?:group|name|version)\s*:\s*["'][^"']+["']\s*,?){3}))?/g;
@@ -55,18 +56,28 @@ function finalize(instance) {
                     }
                     if (group && name) {
                         let found = 0, index = -1;
-                        if (version) {
-                            index = items.findIndex(seg => seg[0] === group && seg[1] === name);
-                            if (index !== -1) {
-                                found = 1;
-                                if (version[0] !== '$' || !kotlin && impl[0].indexOf("'") !== -1) {
-                                    const current = items[index][2].split('.').map(seg => +seg);
-                                    const parts = version.split('.');
-                                    for (let i = 0, value; i < parts.length; ++i) {
-                                        if (isNaN(value = +parts[i]) || +current[i] > value) {
+                        if (version && (index = items.findIndex(seg => seg[0] === group && seg[1] === name)) !== -1) {
+                            found = 1;
+                            if (version[0] !== '$' || !kotlin && impl[0].indexOf("'") !== -1) {
+                                const semver = /^((\s*,\s*)?[([\]]((\s*,\s*)?\d+\.\d+(\s*,\s*)?)+[)\][])+$/;
+                                const pending = items[index][2];
+                                if (semver.test(pending)) {
+                                    found = 2;
+                                }
+                                else if (!semver.test(version)) {
+                                    const getArray = (value) => value.split(/[.-]/).map(seg => +seg);
+                                    const current = getArray(pending);
+                                    const previous = getArray(version);
+                                    for (let i = 0; i < previous.length; ++i) {
+                                        const a = previous[i];
+                                        const b = current[i];
+                                        if (isNaN(a) || b > a) {
                                             found = 2;
                                             break;
                                         }
+                                        if (isNaN(b) || b < a) {
+                                            break;
+                                        }
                                     }
                                 }
                             }
@@ -99,9 +110,9 @@ function finalize(instance) {
                     output = Document.updateGradle(output, ['android', 'buildFeatures'], 'compose = true');
                 }
                 else {
-                    output = Document.updateGradle(output, ['plugins'], "id 'org.jetbrains.kotlin.android'", { upgrade: true, multiple: true, addendum: `version '${instance.findVersion('org.jetbrains.kotlin:kotlin-stdlib', "1.8.21" /* VERSIONS.KOTLIN_STDLIB */)}'` });
+                    output = Document.updateGradle(output, ['plugins'], "id 'org.jetbrains.kotlin.android'", { upgrade: true, multiple: true, addendum: `version '${instance.findVersion('org.jetbrains.kotlin:kotlin-stdlib', "1.9.10" /* VERSIONS.KOTLIN_STDLIB */)}'` });
                     output = Document.updateGradle(output, ['android', 'buildFeatures'], "compose true");
-                    output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.4.6" /* VERSIONS.KOTLIN_COMPILER */)}'`, true);
+                    output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.5.5" /* VERSIONS.KOTLIN_COMPILER */)}'`, true);
                     if (upgrade) {
                         output = Document.updateGradle(output, ['android', 'kotlinOptions'], `jvmTarget = '${javaVersion}'`, true);
                     }
@@ -203,6 +214,19 @@ function finalize(instance) {
             }
         }
     }
+    if (!existing) {
+        ({ localUri, source, existing, kotlin } = instance.findTemplate(this.baseDirectory, "build.gradle" /* GRADLE.FILENAME */, { detect, languageOf: 'gradle', subDir: 'static' }));
+        if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
+            try {
+                if (instance.writeFile(localUri, source, { encoding: 'utf-8', ownPermissionOnly: true, throwsPermission: true })) {
+                    this.add(localUri);
+                }
+            }
+            catch (err) {
+                this.writeFail(["Unable to write file" /* ERR_MESSAGE.WRITE_FILE */, path.basename(localUri)], err, 8192 /* LOG_TYPE.PERMISSION */);
+            }
+        }
+    }
 }
 
 module.exports = finalize;

package/extensions/gradle/settings/index.js

@@ -4,14 +4,13 @@ const path = require("path");
 const util_1 = require("@e-mc/document/util");
 const parse_1 = require("@e-mc/document/parse");
 function finalize(instance) {
-    const { dependencies, projectName, mainParentDir } = instance.config;
+    const { dependencies, projectName, manifest, mainParentDir } = instance.config;
     if (!dependencies && !projectName) {
         return;
     }
     let { localUri, source, existing, kotlin } = instance.findTemplate(this.baseDirectory, 'settings.gradle', { detect: this.incremental !== 'staging', languageOf: 'gradle' });
     if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
-        const targetName = projectName ? projectName.replace(/"/g, '\\"') : '';
-        let modified;
+        let targetName = projectName?.replace(/"/g, '\\"'), modified;
         if (existing) {
             let match;
             if (dependencies) {
@@ -51,10 +50,14 @@ function finalize(instance) {
             }
         }
         else {
+            if (!targetName && (targetName = manifest?.package)) {
+                const index = targetName.lastIndexOf('.');
+                targetName = index !== -1 ? targetName.substring(index + 1) : '';
+            }
             source = (0, util_1.replaceAll)(source, (name) => {
                 switch (name) {
                     case 'projectName':
-                        return targetName;
+                        return targetName || '';
                     case 'name':
                         return ':' + mainParentDir;
                     default:

package/extensions/task/index.js

@@ -5,6 +5,7 @@ const fs = require("fs");
 const child_process = require("child_process");
 const types_1 = require("@e-mc/types");
 const Document = require("@e-mc/document");
+const checkWin32 = (value) => value === "gradlew" /* STRINGS.GRADLEW */ && process.platform === 'win32' ? value + '.bat' : value;
 async function finalize(instance) {
     const commands = instance.config.commands;
     if (!commands || this.incremental === 'staging') {
@@ -25,7 +26,9 @@ async function finalize(instance) {
     else {
         return;
     }
-    let { broadcastId, baseDirectory } = this, command = instance.settings.extensions?.task?.command, title, name, foundCwd;
+    const settings = instance.settings.extensions?.task || {};
+    const exec = settings.exec;
+    let { broadcastId, baseDirectory } = this, command = settings.command, uid, gid, title, filename, foundCwd;
     if (command) {
         if (command.indexOf('mvn') !== -1) {
             title = 'maven';
@@ -34,20 +37,20 @@ async function finalize(instance) {
             title = /([^\\/]+?)(?:\.[a-z]+)?$/i.exec(command)?.[1] || 'SPAWN';
         }
         command = path.normalize(command);
-        if (!command.includes(path.sep)) {
-            name = command;
+        if (!/[\\/]/.test(command = path.normalize(command))) {
+            filename = checkWin32(command);
         }
         command = Document.sanitizeCmd(command);
     }
     else {
-        name = 'gradlew';
-        command = '.' + path.sep + name;
+        filename = checkWin32("gradlew" /* STRINGS.GRADLEW */);
+        command = '.' + path.sep + filename;
         title = 'gradle';
     }
-    if (name) {
+    if (filename) {
         try {
             let appDir = baseDirectory;
-            while (!(foundCwd = fs.existsSync(path.join(appDir, name)))) {
+            while (!(foundCwd = fs.existsSync(path.join(appDir, filename)))) {
                 const parent = path.dirname(appDir);
                 if (parent === appDir) {
                     break;
@@ -61,6 +64,15 @@ async function finalize(instance) {
         catch {
         }
     }
+    if ((0, types_1.isPlainObject)(exec)) {
+        let { uid: u, gid: g } = exec;
+        if ((u = parseInt(u)) >= 0) {
+            uid = u;
+        }
+        if ((g = parseInt(g)) >= 0) {
+            gid = g;
+        }
+    }
     for (const args of taskArgs) {
         if (instance.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
@@ -70,7 +82,7 @@ async function finalize(instance) {
         await new Promise((resolve, reject) => {
             this.formatMessage(4 /* LOG_TYPE.PROCESS */, title, ['Executing task...', task], baseDirectory);
             let out = '', message = '';
-            const { stdout, stderr } = child_process.spawn(command, Document.sanitizeArgs(args), { cwd: baseDirectory, shell: true, stdio: Document.hasLogType(32768 /* LOG_TYPE.STDOUT */) && !broadcastId ? 'inherit' : undefined, signal: instance.signal })
+            const { stdout, stderr } = child_process.spawn(command, Document.sanitizeArgs(args), { cwd: baseDirectory, shell: true, stdio: Document.hasLogType(32768 /* LOG_TYPE.STDOUT */) && !broadcastId ? 'inherit' : undefined, signal: instance.signal, uid, gid })
                 .on('exit', code => {
                 if (!code) {
                     instance.addLog(types_1.STATUS_TYPE.INFO, out);

package/index.d.ts

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

package/index.js

@@ -163,9 +163,9 @@ class AndroidDocument extends Document {
         }
     }
     findTemplate(baseDir, filename, options) {
-        let detect, languageOf;
+        let detect, languageOf, subDir;
         if (options) {
-            ({ detect, languageOf } = options);
+            ({ detect, languageOf, subDir } = options);
         }
         let kotlin, language;
         if (languageOf) {
@@ -179,7 +179,14 @@ class AndroidDocument extends Document {
         const localUri = path.join(baseDir, filename);
         try {
             const existing = detect && fs.existsSync(localUri);
-            const paths = language ? [language, filename] : [filename];
+            const paths = [];
+            if (language) {
+                paths.push(language);
+            }
+            if (subDir) {
+                paths.push(...Array.isArray(subDir) ? subDir : [subDir]);
+            }
+            paths.push(filename);
             let uri;
             if (!existing && !(uri = this.resolveDir('template', ...paths)) && !fs.existsSync(uri = path.join(__dirname, 'template', ...paths))) {
                 throw (0, types_1.errorValue)("File not found" /* ERR_MESSAGE.NOTFOUND_FILE */, uri);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/android",
-  "version": "0.2.2",
+  "version": "0.3.1",
   "description": "Android document constructor for E-mc.",
   "main": "index.js",
   "publishConfig": {
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/document": "^0.5.3",
-    "@e-mc/types": "^0.5.3",
+    "@e-mc/document": "^0.6.0",
+    "@e-mc/types": "^0.6.0",
     "htmlparser2": "^9.0.0"
   }
 }

package/template/AndroidManifest.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="{{package}}">
+<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

package/template/java/build.gradle

@@ -4,12 +4,12 @@ plugins {
 
 android {
     namespace ''
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId ''
-        minSdk 19
-        targetSdk 33
+        minSdk 21
+        targetSdk 34
         versionCode 1
         versionName '1.0'
 

package/template/java/settings.gradle

@@ -1,8 +1,8 @@
 pluginManagement {
     repositories {
-        gradlePluginPortal()
         google()
         mavenCentral()
+        gradlePluginPortal()
     }
 }
 

package/template/java/static/build.gradle

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

package/template/java+kotlin/build.gradle

@@ -5,12 +5,12 @@ plugins {
 
 android {
     namespace ''
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId ''
-        minSdk 19
-        targetSdk 33
+        minSdk 21
+        targetSdk 34
         versionCode 1
         versionName '1.0'
 
@@ -37,7 +37,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.10.0'
+    implementation 'androidx.core:core-ktx:1.12.0'
     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/settings.gradle

@@ -1,8 +1,8 @@
 pluginManagement {
     repositories {
-        gradlePluginPortal()
         google()
         mavenCentral()
+        gradlePluginPortal()
     }
 }
 

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

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

package/template/kotlin/build.gradle.kts

@@ -1,23 +1,23 @@
 plugins {
     id("com.android.application")
-    kotlin("android")
+    id("org.jetbrains.kotlin.android")
 }
 
 android {
     namespace = ""
-    compileSdk(33)
+    compileSdk = 34
 
     defaultConfig {
         applicationId = ""
-        minSdk(19)
-        targetSdk(33)
+        minSdk = 21
+        targetSdk = 34
         versionCode = 1
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
-        getByName("release") {
+        release {
             isDebuggable = false
             isMinifyEnabled = true
             isShrinkResources = false
@@ -38,8 +38,8 @@ java {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.21")
-    implementation("androidx.core:core-ktx:1.10.0")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.10")
+    implementation("androidx.core:core-ktx:1.12.0")
     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 {
-        gradlePluginPortal()
-        google()
-        mavenCentral()
-    }
-}
-
-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

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

package/types/index.d.ts

@@ -2,7 +2,7 @@ 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 { DocumentDirectory as IDocumentDirectory, DocumentModule as IDocumentModule } from '@e-mc/types/lib/settings';
+import type { DocumentDirectory as IDocumentDirectory, DocumentModule as IDocumentModule, ExecAction } from '@e-mc/types/lib/settings';
 
 import type { DocumentOutput } from './squared';
 
@@ -13,6 +13,7 @@ interface DocumentDirectory extends IDocumentDirectory {
 interface AndroidDocumentSettings extends PlainObject {
     extensions?: {
         task?: {
+            exec?: ExecAction;
             command?: string;
         };
     };
@@ -48,6 +49,7 @@ export interface TemplateData {
 export interface FindTemplateOptions {
     detect?: boolean;
     languageOf?: LanguageType;
+    subDir?: ArrayOf<string>;
 }
 
 export interface IAndroidDocument<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends IDocument<T, U>, Pick<DocumentOutput, DocumentProperties> {