@pi-r/android 0.6.4 → 0.6.6

package/extensions/app/manifest/index.js

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const htmlparser2 = require("htmlparser2");
 const domhandler = require("domhandler");
@@ -9,12 +8,12 @@ const util_1 = require("@e-mc/document/util");
 const types_1 = require("@e-mc/types");
 const Parser = htmlparser2.Parser;
 const DomHandler = domhandler.DomHandler;
-function finalize(instance) {
+module.exports = function finalize(instance) {
     const config = instance.config;
     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 +40,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,7 +137,7 @@ 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);
@@ -173,10 +172,8 @@ 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);
             }
         }
     }
-}
-
-module.exports = finalize;
+};

package/extensions/gradle/dependencies/index.js

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const util_1 = require("@e-mc/document/util");
 const types_1 = require("@e-mc/types");
@@ -28,16 +27,17 @@ function isUpgrade(version, pending) {
     }
     return false;
 }
-function finalize(instance) {
+module.exports = function finalize(instance) {
     const config = instance.config;
-    const { profileable, dependencies, dataBinding, versionName, versionCode } = config;
-    if (!profileable && !dependencies && !dataBinding && !versionName && !versionCode && !config.namespace) {
+    const { profileable, dependencies, dataBinding, versionName, versionCode, namespace } = config;
+    if (!profileable && !dependencies && !dataBinding && !versionName && !versionCode && !namespace) {
         return;
     }
     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' });
+    let { localUri, source, existing, kotlin } = instance.findTemplate(path.join(this.baseDirectory, config.mainParentDir), "build.gradle", { detect, languageOf: 'gradle' });
     if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
-        let { namespace, javaVersion, dependencyScopes } = config, jvmTarget, modified;
+        const { javaVersion, dependencyScopes } = config;
+        let jvmTarget, modified;
         const upgrade = javaVersion > 0;
         const setModified = (output) => {
             if (output !== source) {
@@ -79,16 +79,16 @@ function finalize(instance) {
                                 let type = -1;
                                 switch (scope) {
                                     case 'compile':
-                                        type = 0 /* DEPENDENCY_TYPE.IMPLEMENTATION */;
+                                        type = 0;
                                         break;
                                     case 'provided':
-                                        type = 2 /* DEPENDENCY_TYPE.COMPILE_ONLY */;
+                                        type = 2;
                                         break;
                                     case 'runtime':
-                                        type = 4 /* DEPENDENCY_TYPE.RUNTIME_ONLY */;
+                                        type = 4;
                                         break;
                                     case 'test':
-                                        type = 5 /* DEPENDENCY_TYPE.TEST_IMPLEMENTATION */;
+                                        type = 5;
                                         break;
                                 }
                                 if (type !== -1) {
@@ -161,37 +161,37 @@ function finalize(instance) {
                 let content = match[1], named = false, indent, method;
                 const writeMethod = (item, args, prefix = 'implementation') => {
                     switch (parseInt(item[3])) {
-                        case 0 /* DEPENDENCY_TYPE.IMPLEMENTATION */:
+                        case 0:
                             prefix = 'implementation';
                             break;
-                        case 1 /* DEPENDENCY_TYPE.API */:
+                        case 1:
                             prefix = 'api';
                             break;
-                        case 2 /* DEPENDENCY_TYPE.COMPILE_ONLY */:
+                        case 2:
                             prefix = 'compileOnly';
                             break;
-                        case 3 /* DEPENDENCY_TYPE.COMPILE_ONLY_API */:
+                        case 3:
                             prefix = 'compileOnlyApi';
                             break;
-                        case 4 /* DEPENDENCY_TYPE.RUNTIME_ONLY */:
+                        case 4:
                             prefix = 'runtimeOnly';
                             break;
-                        case 5 /* DEPENDENCY_TYPE.TEST_IMPLEMENTATION */:
+                        case 5:
                             prefix = 'testImplementation';
                             break;
-                        case 6 /* DEPENDENCY_TYPE.TEST_COMPILE_ONLY */:
+                        case 6:
                             prefix = 'testCompileOnly';
                             break;
-                        case 7 /* DEPENDENCY_TYPE.TEST_RUNTIME_ONLY */:
+                        case 7:
                             prefix = 'testRuntimeOnly';
                             break;
-                        case 8 /* DEPENDENCY_TYPE.ANDROID_TEST_IMPLEMENTATION */:
+                        case 8:
                             prefix = 'androidTestImplementation';
                             break;
-                        case 9 /* DEPENDENCY_TYPE.ANDROID_TEST_COMPILE_ONLY */:
+                        case 9:
                             prefix = 'androidTestCompileOnly';
                             break;
-                        case 10 /* DEPENDENCY_TYPE.ANDROID_TEST_RUNTIME_ONLY */:
+                        case 10:
                             prefix = 'androidTestRuntimeOnly';
                             break;
                     }
@@ -264,9 +264,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.9.22" /* 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.23")}'` });
                     output = Document.updateGradle(output, ['android', 'buildFeatures'], "compose true");
-                    output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.5.9" /* VERSIONS.KOTLIN_COMPILER */)}'`, true);
+                    output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.5.11")}'`, true);
                     if (upgrade) {
                         output = Document.updateGradle(output, ['android', 'kotlinOptions'], `jvmTarget = '${javaVersion}'`, true);
                     }
@@ -317,8 +317,9 @@ function finalize(instance) {
                     output = Document.updateGradle(output, ['android'], kotlin ? `buildToolsVersion = "${version}"` : `buildToolsVersion "${version}"`, true);
                 }
             }
-            if (namespace || (namespace = config.manifest?.package)) {
-                output = Document.updateGradle(output, ['android', 'defaultConfig'], (kotlin ? 'applicationId = ' : 'applicationId ') + `"${namespace}"`, true);
+            const applicationId = config.manifest?.package;
+            if (applicationId) {
+                output = Document.updateGradle(output, ['android', 'defaultConfig'], (kotlin ? 'applicationId = ' : 'applicationId ') + `"${applicationId}"`, true);
             }
             setModified(output);
         }
@@ -364,12 +365,12 @@ 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);
             }
         }
     }
     if (!existing) {
-        ({ localUri, source, existing, kotlin } = instance.findTemplate(this.baseDirectory, "build.gradle" /* GRADLE.FILENAME */, { detect, languageOf: 'gradle', subDir: 'static' }));
+        ({ localUri, source, existing, kotlin } = instance.findTemplate(this.baseDirectory, "build.gradle", { 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 })) {
@@ -377,10 +378,8 @@ 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);
             }
         }
     }
-}
-
-module.exports = finalize;
+};

package/extensions/gradle/settings/index.js

@@ -1,16 +1,16 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 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, manifest, mainParentDir } = instance.config;
+module.exports = function finalize(instance) {
+    const { dependencies, projectName, mainParentDir } = instance.config;
     if (!dependencies && !projectName) {
         return;
     }
-    let { localUri, source, existing, kotlin } = instance.findTemplate(this.baseDirectory, "settings.gradle" /* GRADLE.FILENAME */, { detect: this.incremental !== 'staging', languageOf: 'gradle' });
+    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 })) {
-        let targetName = projectName?.replace(/"/g, '\\"'), modified;
+        const targetName = projectName?.replace(/"/g, '\\"');
+        let modified;
         if (existing) {
             let match;
             if (dependencies) {
@@ -50,10 +50,6 @@ 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':
@@ -64,6 +60,9 @@ function finalize(instance) {
                         return '';
                 }
             });
+            if (!targetName) {
+                source = source.replace(/rootProject\.name = ["']{2}[\r\n]*/, '');
+            }
         }
         if (modified || !existing) {
             try {
@@ -72,10 +71,8 @@ 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);
             }
         }
     }
-}
-
-module.exports = finalize;
+};

package/extensions/task/index.js

@@ -1,13 +1,12 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
 const child_process = require("child_process");
 const which = require("which");
 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 checkWin32 = (value) => value === "gradlew" && process.platform === 'win32' ? value + '.bat' : value;
+module.exports = async function finalize(instance) {
     const commands = instance.config.commands;
     if (!commands || this.incremental === 'staging') {
         return;
@@ -32,7 +31,7 @@ async function finalize(instance) {
     let { broadcastId, baseDirectory } = this, command = settings.command, uid, gid, title, filename, altname, foundDir;
     if (command) {
         if (command.includes('mvn')) {
-            title = "maven" /* STRINGS.MAVEN */;
+            title = "maven";
         }
         else {
             title = /([^\\/]+?)(?:\.[a-z]+)?$/i.exec(command)?.[1] || 'spawn';
@@ -43,10 +42,10 @@ async function finalize(instance) {
         command = Document.sanitizeCmd(command);
     }
     else {
-        filename = checkWin32("gradlew" /* STRINGS.GRADLEW */);
+        filename = checkWin32("gradlew");
         command = '.' + path.sep + filename;
-        title = "gradle" /* STRINGS.GRADLE */;
-        altname = "gradle" /* STRINGS.GRADLE */;
+        title = "gradle";
+        altname = "gradle";
     }
     if (filename) {
         try {
@@ -87,9 +86,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, uid, gid })
+            const { stdout, stderr } = child_process.spawn(command, Document.sanitizeArgs(args), { cwd: baseDirectory, shell: true, stdio: Document.hasLogType(32768) && !broadcastId ? 'inherit' : undefined, signal: instance.signal, uid, gid })
                 .on('exit', code => {
                 if (!code) {
                     instance.addLog(types_1.STATUS_TYPE.INFO, out);
@@ -97,7 +96,7 @@ async function finalize(instance) {
                     resolve();
                 }
                 else {
-                    reject((0, types_1.errorValue)(message || (!foundDir && 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 || (!foundDir && code === 1 ? "Unable to execute file" : "Unknown"), "Error code" + ': ' + code));
                 }
             })
                 .on('error', err => reject(err));
@@ -118,8 +117,6 @@ 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 }));
     }
-}
-
-module.exports = finalize;
+};

package/index.d.ts

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

package/index.js

@@ -1,10 +1,8 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 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);
@@ -155,7 +153,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);
@@ -193,12 +191,12 @@ class AndroidDocument extends Document {
             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);
+                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 };
     }
@@ -209,7 +207,7 @@ class AndroidDocument extends Document {
                 return this.tryParse(fs.readFileSync(localUri, 'utf-8'), format || path.extname(localUri).substring(1));
             }
             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 null;
@@ -233,5 +231,4 @@ class AndroidDocument extends Document {
         return (_a = this.module).settings || (_a.settings = {});
     }
 }
-
 module.exports = AndroidDocument;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/android",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "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.8.4",
-    "@e-mc/types": "^0.8.4",
+    "@e-mc/document": "^0.8.7",
+    "@e-mc/types": "^0.8.7",
     "htmlparser2": "^9.1.0",
     "which": "^2.0.2"
   }

package/template/java/static/build.gradle

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

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

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.android.application' version '8.2.2' apply false
-    id 'com.android.library' version '8.2.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
+    id 'com.android.application' version '8.3.0' apply false
+    id 'com.android.library' version '8.3.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
 }

package/template/kotlin/build.gradle.kts

@@ -38,7 +38,7 @@ java {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.22")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.23")
     implementation("androidx.core:core-ktx:1.12.0")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")

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

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