@pi-r/android 0.10.3 → 0.10.4

package/extensions/gradle/dependencies/index.js

@@ -10,7 +10,7 @@ const REGEXP_DEPENDENCY = /([ \t]*)([A-Za-z_$][\w$]*)(?:\s*\(?\s*(?:module\(?\s*
 const REGEXP_DEPENDENCY_KOTLIN = /([ \t]*)([A-Za-z_$][\w$]*)\((?:\s*(?:(?:module\(\s*)?"([^"]+)"|((?:\s*(?:group|name|version)\s*=\s*"(?:[^"]|(?<=\\)")+"\s*,?){3}))\s*\))?/gd;
 const REGEXP_LIBRARY = /([ \t]*)implementation\s+(?:(project|files)\s*\(\s*("(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')\s*\)|(fileTree)\s*\(\s*((?:\s*(?:dir|include)\s*:\s*(?:"(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+'|\[[^\]]+\])\s*,?){2})\s*\))[ \t\r]*\n/gd;
 const REGEXP_LIBRARY_KOTLIN = /([ \t]*)implementation\(\s*(?:(project|files)\(\s*"(.+)"\s*\)|(fileTree)\(\s*mapOf\(((?:\s*"(?:dir|include)"\s+to\s+(?:"(?:[^"]|(?<=\\)")+"|listOf\([^)]+\))\s*,?){2})\)\s*\))\s*\)[ \t\r]*\n/gd;
-const REGEXP_VERSIONS = /([^\s]+)\s*=\s*(?:"([^":]+)"|'([^':]+)'|(\{(?:\s*(?:require|strictly|prefer|reject(?:All)?)\s*=\s*(?:"[^":]+"|'[^':]+')\s*,?)+\s*\}))/g;
+const REGEXP_VERSIONS = /([^\s]+)\s*=\s*(?:"([^"]+)"|'([^']+)'|(\{(?:\s*(?:require|strictly|prefer|reject(?:All)?)\s*=\s*(?:"[^"]+"|'[^']+')\s*,?)+\s*\}))/g;
 const REGEXP_VERSIONS_LIB = /([^\s]+)\s*=\s*(?:\{\s*(group|name|module|version(?:\.ref)?)\s*=\s*(?:"([^"]+)"|'([^']+)'|(\{[^}]+\}))\s*,\s*(group|name|module|version(?:\.ref)?)\s*=\s*(?:"([^"]+)"|'([^']+)'|(\{[^}]+\}))(?:\s*,\s*(group|name|module|version(?:\.ref)?)\s*=\s*(?:"([^"]+)"|'([^']+)')|(\{[^}]+\}))?\s*\}|(?:"([^:]+:[^"]+)"|'([^:]+:[^']+)'))/gd;
 function isUpgrade(version, pending) {
     if (isSemVer(pending)) {
@@ -98,6 +98,7 @@ function writeMethod(kotlin, named, item, args = '', prefix = 'implementation')
 }
 const isLatest = (value) => value === '' || value.startsWith('latest.');
 const isSemVer = (value) => isLatest(value) || REGEXP_SEMVER.test(value);
+const writeOutput = (match, source, value) => (0, util_1.spliceString)(source, match.index, match.index + match[0].length, value);
 const toCamelCase = (value) => value.replace(/-([a-z])/gi, (...capture) => capture[1].toUpperCase());
 function finalize(instance) {
     const { profileable, dependencies, libraries, dataBinding, jvmToolchain, versionName, versionCode, namespace, applicationId, mainParentDir } = instance.config;
@@ -339,22 +340,17 @@ function finalize(instance) {
                                 item[2] = '';
                                 libs[key] = { group, name, "version.ref": versionRef };
                             }
-                            let section = /\[libraries\]\s*/.exec(config);
-                            const writeOutput = (value) => (0, util_1.spliceString)(config, section.index, section.index + section[0].length, value);
-                            if (section) {
-                                config = writeOutput(output);
+                            const lib = /\[libraries\]\s*/.exec(config);
+                            if (lib) {
+                                config = writeOutput(lib, config, output);
                             }
                             else {
                                 config += output;
                             }
                             if (outputVer) {
                                 outputVer = '[versions]' + newLine + outputVer;
-                                if (section = /\[versions\]\s*/.exec(config)) {
-                                    config = writeOutput(outputVer);
-                                }
-                                else {
-                                    config = outputVer + newLine + config;
-                                }
+                                const ver = /\[versions\]\s*/.exec(config);
+                                config = ver ? writeOutput(ver, config, outputVer) : outputVer + newLine + config;
                             }
                             REGEXP_VERSIONS.lastIndex = 0;
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/android",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "description": "Android document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/document": "^0.12.7",
-    "@e-mc/types": "^0.12.7",
+    "@e-mc/document": "^0.12.16",
+    "@e-mc/types": "^0.12.16",
     "dom-serializer": "^2.0.0",
     "domhandler": "^5.0.3",
     "domutils": "^3.2.2",