@pi-r/android 0.3.6 → 0.3.7

package/extensions/app/manifest/index.js

@@ -20,14 +20,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':
@@ -45,7 +45,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)) {

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", { detect, languageOf: 'gradle' });
     if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
         let { namespace, javaVersion } = config, jvmTarget, modified;
         const upgrade = javaVersion > 0;
@@ -96,9 +97,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.24")}'` });
+                    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.14")}'`, 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);
                     }
@@ -200,6 +201,19 @@ function finalize(instance) {
             }
         }
     }
+    if (!existing) {
+        ({ 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 })) {
+                    this.add(localUri);
+                }
+            }
+            catch (err) {
+                this.writeFail(["Unable to write file", path.basename(localUri)], err, 8192);
+            }
+        }
+    }
 }
 
 module.exports = finalize;

package/extensions/gradle/settings/index.js

@@ -3,14 +3,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 === null || projectName === void 0 ? void 0 : projectName.replace(/"/g, '\\"'), modified;
         if (existing) {
             let match;
             if (dependencies) {
@@ -50,10 +49,14 @@ function finalize(instance) {
             }
         }
         else {
+            if (!targetName && (targetName = manifest === null || manifest === void 0 ? void 0 : 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,7 +5,7 @@ const child_process = require("child_process");
 const types_1 = require("@e-mc/types");
 const Document = require("@e-mc/document");
 async function finalize(instance) {
-    var _a, _b, _c;
+    var _a, _b;
     const commands = instance.config.commands;
     if (!commands || this.incremental === 'staging') {
         return;
@@ -25,13 +25,15 @@ async function finalize(instance) {
     else {
         return;
     }
-    let { broadcastId, baseDirectory } = this, command = (_b = (_a = instance.settings.extensions) === null || _a === void 0 ? void 0 : _a.task) === null || _b === void 0 ? void 0 : _b.command, title, name, foundCwd;
+    const settings = ((_a = instance.settings.extensions) === null || _a === void 0 ? void 0 : _a.task) || {};
+    const exec = settings.exec;
+    let { broadcastId, baseDirectory } = this, command = settings.command, uid, gid, title, name, foundCwd;
     if (command) {
         if (command.indexOf('mvn') !== -1) {
             title = 'maven';
         }
         else {
-            title = ((_c = /([^\\/]+?)(?:\.[a-z]+)?$/i.exec(command)) === null || _c === void 0 ? void 0 : _c[1]) || 'SPAWN';
+            title = ((_b = /([^\\/]+?)(?:\.[a-z]+)?$/i.exec(command)) === null || _b === void 0 ? void 0 : _b[1]) || 'SPAWN';
         }
         command = path.normalize(command);
         if (!command.includes(path.sep)) {
@@ -61,6 +63,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 +81,7 @@ async function finalize(instance) {
         await new Promise((resolve, reject) => {
             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) && !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, uid, gid })
                 .on('exit', code => {
                 if (!code) {
                     instance.addLog(types_1.STATUS_TYPE.INFO, out);

package/index.js

@@ -162,9 +162,9 @@ class AndroidDocument extends Document {
     }
     findTemplate(baseDir, filename, options) {
         var _a;
-        let detect, languageOf;
+        let detect, languageOf, subDir;
         if (options) {
-            ({ detect, languageOf } = options);
+            ({ detect, languageOf, subDir } = options);
         }
         let kotlin, language;
         if (languageOf) {
@@ -178,7 +178,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", uri);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/android",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "Android document constructor for E-mc.",
   "main": "index.js",
   "publishConfig": {

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> {