@pi-r/android 0.3.1 → 0.3.3

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2023 Lisa Mishima
 
 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

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const htmlparser2 = require("htmlparser2");
 const domhandler = require("domhandler");
@@ -14,7 +13,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 +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);
@@ -174,7 +173,7 @@ 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);
             }
         }
     }

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");
@@ -11,7 +10,7 @@ function finalize(instance) {
         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 } = config, jvmTarget, modified;
         const upgrade = javaVersion > 0;
@@ -26,7 +25,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+\{((?:{[^}]*}|(?![{}])[\S\s])+)\}/.exec(source);
+            const match = /dependencies\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;
@@ -59,25 +58,12 @@ function finalize(instance) {
                         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;
-                                        }
+                                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;
                                     }
                                 }
                             }
@@ -110,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.9.10" /* 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.5.5" /* 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);
                     }
@@ -210,12 +196,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 })) {
@@ -223,7 +209,7 @@ 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);
             }
         }
     }

package/extensions/gradle/settings/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 parse_1 = require("@e-mc/document/parse");
@@ -72,7 +71,7 @@ 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);
             }
         }
     }

package/extensions/task/index.js

@@ -1,11 +1,9 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 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') {
@@ -28,7 +26,7 @@ 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, foundCwd;
+    let { broadcastId, baseDirectory } = this, command = settings.command, uid, gid, title, name, foundCwd;
     if (command) {
         if (command.indexOf('mvn') !== -1) {
             title = 'maven';
@@ -37,20 +35,20 @@ async function finalize(instance) {
             title = /([^\\/]+?)(?:\.[a-z]+)?$/i.exec(command)?.[1] || 'SPAWN';
         }
         command = path.normalize(command);
-        if (!/[\\/]/.test(command = path.normalize(command))) {
-            filename = checkWin32(command);
+        if (!command.includes(path.sep)) {
+            name = command;
         }
         command = Document.sanitizeCmd(command);
     }
     else {
-        filename = checkWin32("gradlew" /* STRINGS.GRADLEW */);
-        command = '.' + path.sep + filename;
+        name = 'gradlew';
+        command = '.' + path.sep + name;
         title = 'gradle';
     }
-    if (filename) {
+    if (name) {
         try {
             let appDir = baseDirectory;
-            while (!(foundCwd = fs.existsSync(path.join(appDir, filename)))) {
+            while (!(foundCwd = fs.existsSync(path.join(appDir, name)))) {
                 const parent = path.dirname(appDir);
                 if (parent === appDir) {
                     break;
@@ -80,9 +78,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);
@@ -90,7 +88,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));
@@ -111,7 +109,7 @@ 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 }));
     }
 }
 

package/index.d.ts

@@ -1,4 +1,4 @@
-import type { IFileManager } from '@e-mc/types/types/lib';
+import type { IFileManager } from '@e-mc/types/lib';
 
 import type { AndroidDocumentConstructor, DocumentAsset } from './types';
 

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);
@@ -151,7 +149,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);
@@ -189,12 +187,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 };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/android",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "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.6.0",
-    "@e-mc/types": "^0.6.0",
+    "@e-mc/document": "^0.6.2",
+    "@e-mc/types": "^0.6.2",
     "htmlparser2": "^9.0.0"
   }
 }

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

@@ -1,5 +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
+    id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
 }

package/template/kotlin/build.gradle.kts

@@ -38,7 +38,7 @@ java {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.10")
+    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")

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

@@ -1,5 +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
+    id("org.jetbrains.kotlin.android") version "1.9.22" apply false
 }