@e-mc/document 0.1.0 → 0.3.0

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.1.0",
+  "version": "0.3.0",
   "description": "Document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,9 +20,9 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.1.0",
-    "@e-mc/db": "0.1.0",
-    "@e-mc/types": "0.1.0",
+    "@e-mc/core": "0.3.0",
+    "@e-mc/db": "0.3.0",
+    "@e-mc/types": "0.3.0",
     "chalk": "4.1.2",
     "htmlparser2": "^8.0.1",
     "js-yaml": "^4.1.0",

package/parse/dom.d.ts

@@ -1,4 +1,4 @@
-import type { IGNORE_FLAG, DomWriterConstructor, HtmlElementConstructor } from './document';
+import type { IGNORE_FLAG, DomWriterConstructor, HtmlElementConstructor } from './types';
 
 declare namespace dom {
     const IGNORE_FLAG: IGNORE_FLAG;

package/parse/index.d.ts

@@ -1,4 +1,4 @@
-import type { IGNORE_FLAG, XmlWriterConstructor, XmlElementConstructor } from './document';
+import type { IGNORE_FLAG, XmlWriterConstructor, XmlElementConstructor } from './types';
 
 declare namespace parse {
     const IGNORE_FLAG: IGNORE_FLAG;

package/parse/{document.d.ts → types/index.d.ts}

@@ -1,4 +1,4 @@
-import type { XmlTagNode as IXmlTagNode, TagAppend, TagData } from '../../types/lib/squared';
+import type { XmlTagNode as IXmlTagNode, TagAppend, TagData } from '../../../types/lib/squared';
 
 // @ts-ignore
 import type { ParserOptions } from 'htmlparser2';
@@ -105,7 +105,10 @@ export class IXmlBase {
 }
 
 export class IXmlWriter extends IXmlBase {
+    modifyCount: number;
+    failCount: number;
     elements: XmlTagNode[];
+    errors: Error[];
     parser?: ParserOptions;
     ignoreTagName?: string;
     ignoreTagGroup?: string[];
@@ -127,7 +130,7 @@ export class IXmlWriter extends IXmlBase {
     renameTag(node: XmlTagNode, tagName: string): void;
     indexTag(tagName: string, append?: TagAppend, offset?: number): void;
     resetTag(tagName: string): void;
-    ignoreTag(value: string): void;
+    ignoreTag(value: StringOfArray): void;
     resetPosition(startIndex?: number): void;
     getElementById(id: string, ignoreCase?: boolean, options?: TagNodeByIdOptions): Undef<SourceTagNode>;
     getElementsByTagName(tagName: string, ignoreCase?: boolean, options?: TagNodeOptions): SourceTagNode[];
@@ -180,7 +183,7 @@ export class IXmlElement extends IXmlBase {
     parseOuterXml(value?: string, tagVoid?: boolean): [string, string, boolean];
     getTagOffset(replacement?: string, options?: TagOffsetOptions): Undef<TagOffsetMap>;
     setAttribute(name: string, value: string): void;
-    getAttribute(name: string): Optional<string>;
+    getAttribute(name: string): string;
     removeAttribute(...names: string[]): void;
     hasAttribute(name: string): boolean;
     hasModifiedContent(): boolean;
@@ -233,5 +236,6 @@ export interface DomWriterConstructor extends XmlWriterConstructor {
 export class IHtmlElement extends IXmlElement {}
 
 export interface HtmlElementConstructor extends XmlElementConstructor {
+    readonly prototype: IHtmlElement;
     new(documentName: string, node: XmlTagNode, attributes?: PlainObject, options?: ParserAction): IHtmlElement;
 }

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;

package/android/document.d.ts

@@ -1,66 +0,0 @@
-import type { FinalizedElement } from '../../types/lib/squared';
-import type { DocumentOutput } from '../../types/lib/android';
-
-import type { DocumentConstructor, IDocument, IFileManager } from '../../types/lib';
-import type { ExternalAsset } from '../../types/lib/asset';
-import type { DocumentDirectory as IDocumentDirectory, DocumentModule as IDocumentModule } from '../../types/lib/settings';
-
-interface DocumentDirectory extends IDocumentDirectory {
-    template?: string;
-}
-
-interface AndroidDocumentSettings extends PlainObject {
-    extensions?: {
-        task?: {
-            command?: string;
-        };
-    };
-    language?: {
-        gradle?: "java" | "kotlin" | "java+kotlin";
-    };
-    directory?: DocumentDirectory;
-}
-
-type LanguageType = "gradle";
-type DocumentProperties = "targetAPI" | "elements" | "extensionData" | "directories";
-
-export interface UserConfig extends Omit<DocumentOutput, DocumentProperties> {
-    mainParentDir: string;
-    mainSrcDir: string;
-    mainActivityFile: string;
-    javaVersion: number;
-    dataBinding: boolean;
-}
-
-export interface DocumentModule extends IDocumentModule {
-    settings?: AndroidDocumentSettings;
-}
-
-export interface TemplateData {
-    localUri?: string;
-    source?: string;
-    existing?: boolean;
-    kotlin?: boolean;
-    language?: string;
-}
-
-export interface FindTemplateOptions {
-    detect?: boolean;
-    languageOf?: LanguageType;
-}
-
-export interface IAndroidDocument<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends IDocument<T, U>, Pick<DocumentOutput, DocumentProperties> {
-    config: UserConfig;
-    elements: FinalizedElement[];
-    extensionData: PlainObject;
-    findTemplate(baseDir: string, filename: string, options?: FindTemplateOptions): TemplateData;
-    detectKts(...paths: string[]): Null<boolean>;
-    get settings(): AndroidDocumentSettings;
-}
-
-export interface AndroidDocumentConstructor<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends DocumentConstructor<T, U> {
-    readonly prototype: IAndroidDocument<T, U>;
-    new(module?: DocumentModule, ...args: unknown[]): IAndroidDocument<T, U>;
-}
-
-export type DocumentAsset = ExternalAsset;

package/android/extensions/app/manifest/index.js

@@ -1,186 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
-const htmlparser2 = require("htmlparser2");
-const domhandler = require("domhandler");
-const domutils = require("domutils");
-const domserializer = require("dom-serializer");
-const util_1 = require("../../../../util");
-const types_1 = require("../../../../../types");
-const Parser = htmlparser2.Parser;
-const DomHandler = domhandler.DomHandler;
-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.archiving });
-    if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
-        const { package: manifestPackage, application = {} } = config.manifest;
-        const { supportsRtl, label, theme, activity, metaData = [], activityName, fontProvider } = application;
-        const profileable = config.profileable;
-        let modified;
-        if (!existing) {
-            source = (0, util_1.replaceAll)(source.replace(manifestPackage ? '{{package}}' : ' package="{{package}}"', manifestPackage || ''), (name) => {
-                switch (name) {
-                    case 'supportsRtl':
-                        return supportsRtl === false ? 'false' : 'true';
-                    case 'label':
-                        return '@string/' + (label || 'app_name');
-                    case 'theme':
-                        return theme ? '@style/' + theme : '';
-                    case 'activityName':
-                        return activityName || '';
-                    case 'profileable':
-                        return profileable ? 'true' : 'false';
-                    default:
-                        return '';
-                }
-            });
-        }
-        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 */);
-                    return;
-                }
-                let target = null;
-                if (manifestPackage && (target = domutils.findOne(elem => elem.tagName === 'manifest', dom, true))) {
-                    target.attribs['package'] = manifestPackage;
-                    modified = true;
-                }
-                if (target = domutils.findOne(elem => elem.tagName === 'application', dom, true)) {
-                    if (label) {
-                        target.attribs['android:label'] = '@string/' + label;
-                        modified = true;
-                    }
-                    if (theme) {
-                        target.attribs['android:theme'] = '@style/' + theme;
-                        modified = true;
-                    }
-                    if (supportsRtl !== undefined) {
-                        target.attribs['android:supportsRtl'] = supportsRtl.toString();
-                        modified = true;
-                    }
-                    if (activityName || activity) {
-                        const activities = domutils.getElementsByTagName('activity', target, true);
-                        if (activityName) {
-                            for (const item of activities) {
-                                const intentFilter = domutils.findAll(elem => elem.tagName === 'intent-filter', [item]);
-                                if (intentFilter.length) {
-                                    const action = domutils.findOne(elem => elem.tagName === 'action' && elem.attribs['android:name'] === 'android.intent.action.MAIN', intentFilter);
-                                    if (action) {
-                                        const attribs = item.attribs;
-                                        attribs['android:name'] = activityName;
-                                        attribs['android:exported'] = 'true';
-                                        modified = true;
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-                        if (activity) {
-                            for (const name in activity) {
-                                const { layout: attribs } = activity[name];
-                                if (attribs) {
-                                    let element = domutils.findOne(elem => elem.attribs['android:name'] === name, activities);
-                                    if (!element) {
-                                        domutils.appendChild(target, element = new domhandler.Element('activity', { 'android:name': name }));
-                                        domutils.append(element, new domhandler.Text('\n'));
-                                    }
-                                    let layout = domutils.findOne(elem => elem.tagName === 'layout', [element]), found = true;
-                                    if (!layout) {
-                                        domutils.appendChild(element, layout = new domhandler.Element('layout', {}));
-                                        domutils.append(layout, new domhandler.Text('\n'));
-                                        found = false;
-                                    }
-                                    for (const attr in attribs) {
-                                        switch (attr) {
-                                            case 'defaultHeight':
-                                            case 'defaultWidth':
-                                            case 'minHeight':
-                                            case 'minWidth':
-                                            case 'gravity': {
-                                                const value = attribs[attr];
-                                                if (!found || layout.attribs['android:' + attr] !== value) {
-                                                    layout.attribs['android:' + attr] = value;
-                                                    modified = true;
-                                                }
-                                                break;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    if (profileable !== undefined) {
-                        const attribs = profileable ? { 'android:shell': 'true', 'android:enabled': 'true' } : { 'android:enabled': 'false' };
-                        const element = domutils.findOne(elem => elem.tagName === 'profileable', [target]);
-                        if (element) {
-                            Object.assign(element.attribs, attribs);
-                        }
-                        else if (profileable) {
-                            domutils.appendChild(target, new domhandler.Element('profileable', attribs));
-                            domutils.appendChild(target, new domhandler.Text('\n'));
-                        }
-                        modified = true;
-                    }
-                    if (modified) {
-                        source = domserializer.default(dom, { xmlMode: true });
-                    }
-                }
-            }), { xmlMode: true, decodeEntities: false }).end(source);
-        }
-        if (fontProvider) {
-            metaData.push({ name: 'preloaded_fonts', resource: '@array/' + fontProvider });
-        }
-        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 */);
-                    return;
-                }
-                const app = domutils.findOne(elem => elem.tagName === 'application', dom, true);
-                if (app) {
-                    for (const { name, resource, value } of metaData) {
-                        if (name && (resource || value)) {
-                            let item = domutils.findOne(elem => elem.tagName === 'meta-data' && elem.attribs['android:name'] === name, app.childNodes);
-                            if (!item) {
-                                domutils.appendChild(app, item = new domhandler.Element('meta-data', { 'android:name': name }));
-                                domutils.append(item, new domhandler.Text('\n'));
-                            }
-                            else if (item.attribs['android:resource'] === resource || item.attribs['android:value'] === value) {
-                                continue;
-                            }
-                            if (resource) {
-                                item.attribs['android:resource'] = resource;
-                            }
-                            if (value) {
-                                item.attribs['android:value'] = value;
-                            }
-                            source = domserializer.default(dom, { xmlMode: true });
-                            modified = true;
-                        }
-                    }
-                }
-            }), { xmlMode: true, decodeEntities: false }).end(source);
-        }
-        if (modified || !existing) {
-            try {
-                if (instance.writeFile(localUri, source, { encoding: 'utf-8', ownPermissionOnly: true, throwsPermission: true }) && !existing) {
-                    this.add(localUri);
-                }
-            }
-            catch (err) {
-                this.writeFail(["Unable to write file" /* ERR_MESSAGE.WRITE_FILE */, path.basename(localUri)], err, 8192 /* LOG_TYPE.PERMISSION */);
-            }
-        }
-    }
-}
-exports.default = finalize;
-
-if (exports.default) {
-    module.exports = exports.default;
-    module.exports.default = exports.default;
-}