@pi-r/android 0.2.2 → 0.2.8

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2023 Mile Square Park
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -1,5 +1,7 @@
-### @pi-r/android
+# @pi-r/android
 
-### LICENSE
+PEP 402 - Forever
+
+## LICENSE
 
 MIT

package/extensions/app/manifest/index.js

@@ -14,7 +14,7 @@ function finalize(instance) {
     if (!config.manifest) {
         return;
     }
-    let { localUri, source, existing } = instance.findTemplate(path.join(this.baseDirectory, config.mainParentDir, config.mainSrcDir), "AndroidManifest.xml" /* MANIFEST.FILENAME */, { detect: this.incremental !== 'staging' });
+    let { localUri, source, existing } = instance.findTemplate(path.join(this.baseDirectory, config.mainParentDir, config.mainSrcDir), "AndroidManifest.xml", { detect: this.incremental !== 'staging' });
     if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
         const { package: manifestPackage, application = {} } = config.manifest;
         const { supportsRtl, label, theme, activity, metaData = [], activityName, fontProvider } = application;
@@ -41,7 +41,7 @@ function finalize(instance) {
         else if (manifestPackage || theme || activityName || activity || supportsRtl !== undefined) {
             new Parser(new DomHandler((err, dom) => {
                 if (err) {
-                    instance.writeFail(['Unable to parse XML document', "AndroidManifest.xml" /* MANIFEST.FILENAME */], err, 0 /* LOG_TYPE.UNKNOWN */);
+                    instance.writeFail(['Unable to parse XML document', "AndroidManifest.xml"], err, 0);
                     return;
                 }
                 let target = null;
@@ -138,30 +138,31 @@ function finalize(instance) {
         if ((0, types_1.isArray)(metaData)) {
             new Parser(new DomHandler((err, dom) => {
                 if (err) {
-                    instance.writeFail(['Unable to parse XML document', "AndroidManifest.xml" /* MANIFEST.FILENAME */], err, 0 /* LOG_TYPE.UNKNOWN */);
+                    instance.writeFail(['Unable to parse XML document', "AndroidManifest.xml"], err, 0);
                     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);
@@ -173,10 +174,14 @@ function finalize(instance) {
                 }
             }
             catch (err) {
-                this.writeFail(["Unable to write file" /* ERR_MESSAGE.WRITE_FILE */, path.basename(localUri)], err, 8192 /* LOG_TYPE.PERMISSION */);
+                this.writeFail(["Unable to write file", path.basename(localUri)], err, 8192);
             }
         }
     }
 }
+exports.default = finalize;
 
-module.exports = finalize;
+if (exports.default) {
+    module.exports = exports.default;
+    module.exports.default = exports.default;
+}

package/extensions/gradle/dependencies/index.js

@@ -55,18 +55,15 @@ 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) {
-                                            found = 2;
-                                            break;
-                                        }
+                        if (version && (index = items.findIndex(seg => seg[0] === group && seg[1] === name)) !== -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) {
+                                        found = 2;
+                                        break;
                                     }
                                 }
                             }
@@ -99,9 +96,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.22")}'` });
                     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.9")}'`, true);
                     if (upgrade) {
                         output = Document.updateGradle(output, ['android', 'kotlinOptions'], `jvmTarget = '${javaVersion}'`, true);
                     }
@@ -199,10 +196,14 @@ function finalize(instance) {
                 }
             }
             catch (err) {
-                this.writeFail(["Unable to write file" /* ERR_MESSAGE.WRITE_FILE */, path.basename(localUri)], err, 8192 /* LOG_TYPE.PERMISSION */);
+                this.writeFail(["Unable to write file", path.basename(localUri)], err, 8192);
             }
         }
     }
 }
+exports.default = finalize;
 
-module.exports = finalize;
+if (exports.default) {
+    module.exports = exports.default;
+    module.exports.default = exports.default;
+}

package/extensions/gradle/settings/index.js

@@ -69,10 +69,14 @@ function finalize(instance) {
                 }
             }
             catch (err) {
-                this.writeFail(["Unable to write file" /* ERR_MESSAGE.WRITE_FILE */, path.basename(localUri)], err, 8192 /* LOG_TYPE.PERMISSION */);
+                this.writeFail(["Unable to write file", path.basename(localUri)], err, 8192);
             }
         }
     }
 }
+exports.default = finalize;
 
-module.exports = finalize;
+if (exports.default) {
+    module.exports = exports.default;
+    module.exports.default = exports.default;
+}

package/extensions/task/index.js

@@ -68,9 +68,9 @@ async function finalize(instance) {
         const startTime = process.hrtime();
         const task = args.join(' ');
         await new Promise((resolve, reject) => {
-            this.formatMessage(4 /* LOG_TYPE.PROCESS */, title, ['Executing task...', task], baseDirectory);
+            this.formatMessage(4, 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) && !broadcastId ? 'inherit' : undefined, signal: instance.signal })
                 .on('exit', code => {
                 if (!code) {
                     instance.addLog(types_1.STATUS_TYPE.INFO, out);
@@ -78,7 +78,7 @@ async function finalize(instance) {
                     resolve();
                 }
                 else {
-                    reject((0, types_1.errorValue)(message || (!foundCwd && code === 1 ? "Unable to execute file" /* ERR_MESSAGE.EXECUTE_FILE */ : "Unknown" /* ERR_MESSAGE.UNKNOWN */), "Error code" /* ERR_MESSAGE.ERROR_CODE */ + ': ' + code));
+                    reject((0, types_1.errorValue)(message || (!foundCwd && code === 1 ? "Unable to execute file" : "Unknown"), "Error code" + ': ' + code));
                 }
             })
                 .on('error', err => reject(err));
@@ -99,8 +99,12 @@ async function finalize(instance) {
                 });
             }
         })
-            .catch(err => instance.writeFail(["Unable to perform task" /* ERR_MESSAGE.PERFORM_TASK */, command + ' ' + task], err, { type: 4 /* LOG_TYPE.PROCESS */, startTime }));
+            .catch(err => instance.writeFail(["Unable to perform task", command + ' ' + task], err, { type: 4, startTime }));
     }
 }
+exports.default = finalize;
 
-module.exports = finalize;
+if (exports.default) {
+    module.exports = exports.default;
+    module.exports.default = exports.default;
+}

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

@@ -4,7 +4,6 @@ const fs = require("fs");
 const path = require("path");
 const types_1 = require("@e-mc/types");
 const Document = require('@e-mc/document');
-// @ts-ignore
 class AndroidDocument extends Document {
     constructor() {
         super(...arguments);
@@ -151,7 +150,7 @@ class AndroidDocument extends Document {
                     await instance.tryFile(buffer, localUri, { format: 'ttf', etag: file.etag }, (err, result) => {
                         if (err) {
                             host.deleteFile(localUri);
-                            host.writeFail("Unable to compress file" /* ERR_MESSAGE.COMPRESS_FILE */, err, 8 /* LOG_TYPE.COMPRESS */);
+                            host.writeFail("Unable to compress file", err, 8);
                         }
                         else if ((0, types_1.isString)(result)) {
                             host.replace(file, result);
@@ -182,12 +181,12 @@ class AndroidDocument extends Document {
             const paths = language ? [language, filename] : [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);
+                throw (0, types_1.errorValue)("File not found", uri);
             }
             return { localUri, source: fs.readFileSync(uri || localUri, 'utf-8'), existing, kotlin, language };
         }
         catch (err) {
-            this.writeFail(["Unable to read file" /* ERR_MESSAGE.READ_FILE */, path.basename(localUri)], err, 32 /* LOG_TYPE.FILE */);
+            this.writeFail(["Unable to read file", path.basename(localUri)], err, 32);
         }
         return { kotlin, language };
     }
@@ -210,5 +209,9 @@ class AndroidDocument extends Document {
         return (_a = this.module).settings || (_a.settings = {});
     }
 }
+exports.default = AndroidDocument;
 
-module.exports = AndroidDocument;
+if (exports.default) {
+    module.exports = exports.default;
+    module.exports.default = exports.default;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/android",
-  "version": "0.2.2",
+  "version": "0.2.8",
   "description": "Android document constructor for E-mc.",
   "main": "index.js",
   "publishConfig": {
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/pi-r.git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
     "directory": "src/module/android"
   },
   "keywords": [
@@ -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.5.4",
+    "@e-mc/types": "^0.5.4",
     "htmlparser2": "^9.0.0"
   }
 }

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+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/kotlin/build.gradle.kts

@@ -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"
 
@@ -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.22")
+    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 {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.name = "${{projectName}}"
 include("{{name}}")