@e-mc/document 0.0.4 → 0.2.0

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

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

package/index.js

@@ -194,8 +194,8 @@ class Document extends core_1.Client {
         catch {
         }
     }
-    static createSourceMap(code, uri) {
-        return new transform_1.SourceMap(code, uri);
+    static createSourceMap(code, uri, remove) {
+        return new transform_1.SourceMap(code, uri, remove);
     }
     static updateGradle(source, namespaces, value, options) {
         const local = /^(\w+)\s*(=)?\s*(".+"|'.+'|\([\S\s]+\)||\[[\S\s]+\]|\S+)$/.exec(value = value.trim());
@@ -860,13 +860,13 @@ class Document extends core_1.Client {
             }
             const username = this.host?.username || '';
             const cache = CACHE_TEMPLATE[name] || (CACHE_TEMPLATE[name] = {});
-            const cacheKey = username + core_1.Client.asHash(template + (compile ? core_1.Client.asString(compile) : ''), 64 /* VALUES.HASH_MINLENGTH */);
+            const cacheKey = username + core_1.Client.asHash(template + (compile ? core_1.Client.asString(compile) : ''));
             let result = '', render, valid;
             if (!(render = cache[cacheKey])) {
                 render = await context.compile(template, compile); // eslint-disable-line @typescript-eslint/await-thenable
                 cache[cacheKey] = render;
                 if (!core_1.Client.enabled("memory.settings.users" /* KEY_NAME.MEMORY_SETTINGS_USERS */, username)) {
-                    setTimeout(() => delete cache[cacheKey], 60000 /* VALUES.TEMPLATE_TIMEOUT */);
+                    setTimeout(() => delete cache[cacheKey], 60000 /* VALUES.TEMPLATE_EXPIRES */);
                 }
             }
             for (let i = 0, j = 0, row; i < length; ++i) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/document",
-  "version": "0.0.4",
+  "version": "0.2.0",
   "description": "Document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,9 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.0.4",
-    "@e-mc/db": "0.0.4",
+    "@e-mc/core": "0.2.0",
+    "@e-mc/db": "0.2.0",
+    "@e-mc/types": "0.2.0",
     "chalk": "4.1.2",
     "htmlparser2": "^8.0.1",
     "js-yaml": "^4.1.0",

package/transform/index.js

@@ -248,16 +248,27 @@ class SourceMap {
     static isRaw(map) {
         return (0, types_1.isObject)(map) && (0, types_1.isString)(map.mappings);
     }
-    constructor(code, uri) {
-        this.code = code;
+    constructor(code, uri, remove) {
         this.output = new Map();
         this.sourceMappingURL = '';
         this[_d] = undefined;
-        this[kCode] = code;
-        const map = SourceMap.findSourceMap(code, uri);
+        if (typeof uri === 'boolean') {
+            remove = uri;
+            uri = undefined;
+        }
+        let map;
+        if (remove) {
+            const items = SourceMap.removeSourceMappingURL(code);
+            if (map = items[2]) {
+                code = items[0];
+            }
+        }
+        map || (map = SourceMap.findSourceMap(code, uri));
         if (SourceMap.isRaw(map)) {
             this.nextMap('unknown', code, map);
         }
+        this[kCode] = code;
+        this.code = code;
     }
     reset(restore) {
         if (restore) {
@@ -307,4 +318,4 @@ class SourceMap {
 }
 exports.SourceMap = SourceMap;
 _d = kMap;
-SourceMap.RE_SOURCE_MAPPING_URL = /\n*(?:(\/\/)|(\/\*))\s*[#@][ ]+sourceMappingURL=(data:[^,]+,)?(\S+)\s*(\*\/)?\n?/g;
+SourceMap.RE_SOURCE_MAPPING_URL = /(?:\r\n|\n)*(?:(\/\/)|(\/\*))\s*[#@][ ]+sourceMappingURL=(data:[^,]+,)?(\S+)\s*(\*\/)?\r?\n?/g;

package/util.d.ts

@@ -2,7 +2,7 @@ declare namespace util {
     function loadPlugins<T = unknown>(name: string | unknown[], plugins?: unknown[]): T[];
     function replaceAll(source: string, valueOf: (name: string) => string, opening?: string, closing?: string): string;
     function concatString(values: string[] | string | undefined, newline?: string): string;
-    function splitEnclosing(value: string, pattern?: string | RegExp, trim?: boolean | number, opening?: string, closing?: string): string[];
+    function splitEnclosing(value: string, pattern?: string | RegExp, options?: { trim?: boolean, start?: number, startWith?: number, count?: number } | boolean | number, opening?: string, closing?: string): string[];
     function appendSuffix(filename: string, value: string, separator?: string): string;
     function getIndent(value: string, spaces?: number): string;
     function getNewline(value: string): string;

package/util.js

@@ -38,7 +38,7 @@ function concatString(values, newline) {
     return typeof values === 'string' ? values : '';
 }
 exports.concatString = concatString;
-function splitEnclosing(value, pattern, trim, opening = '(', closing = ')') {
+function splitEnclosing(value, pattern, options, opening = '(', closing = ')') {
     pattern || (pattern = opening);
     let position = 0, index = -1, end = 0, char;
     if (typeof pattern === 'string') {
@@ -70,18 +70,27 @@ function splitEnclosing(value, pattern, trim, opening = '(', closing = ')') {
         return -1;
     };
     complete: {
-        let j = 0, k = 0;
-        if (typeof trim === 'number') {
-            if (trim < 0) {
-                result.push(value.substring(0, position = trim * -1));
-            }
-            else if (trim < 1) {
-                position = trim * length;
-            }
-            else {
-                k = trim;
+        let j = 0, count = 0, trim;
+        if (options !== undefined) {
+            switch (typeof options) {
+                case 'number':
+                    count = options;
+                    break;
+                case 'boolean':
+                    trim = options;
+                    break;
+                default: {
+                    let start, startWith;
+                    ({ trim, start, startWith, count = 0 } = options);
+                    if (startWith !== undefined) {
+                        result.push(value.substring(0, position = startWith));
+                    }
+                    else if (start !== undefined) {
+                        position = start;
+                    }
+                    break;
+                }
             }
-            trim = false;
         }
         while ((index = nextIndex()) !== -1) {
             if (index !== position) {
@@ -106,7 +115,7 @@ function splitEnclosing(value, pattern, trim, opening = '(', closing = ')') {
                         if (position === length) {
                             return result;
                         }
-                        if (++j === k) {
+                        if (++j === count) {
                             break complete;
                         }
                         break found;