@e-mc/document 0.8.6 → 0.9.0

package/LICENSE

@@ -1,11 +1,11 @@
-Copyright 2024 An Pham
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
+Copyright 2024 An Pham
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/README.md

@@ -1,6 +1,6 @@
 # @e-mc/document
 
-* NodeJS 14
+* NodeJS 14/16
 * ES2020
 
 ## General Usage
@@ -9,7 +9,7 @@
 
 ## Interface
 
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/index.d.ts
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.0/lib/index.d.ts)
 
 ```typescript
 import type { DataSource, ViewEngine } from "./squared";
@@ -31,20 +31,22 @@ interface IDocument extends IClient<IFileManager, DocumentModule, TransformCallb
     customize(options?: CustomizeOptions): void;
     findConfig(data: object, name: string, type?: string): PluginConfig;
     loadConfig(data: object, name: string): ConfigOrTransformer | null | undefined;
-    asSourceFile(value: string, options?: AsSourceFileOptions | boolean): unknown;
+    asSourceFile(value: string, cache: boolean): unknown;
+    asSourceFile(value: string, options?: AsSourceFileOptions): unknown;
     findVersion(name: string | string[], fallback?: string): string;
     findSourceScope(uri: string, imports: Record<string, unknown>): Record<string, string | undefined>[];
     findSourceRoot(uri: string, imports?: Record<string, string | undefined>): string | undefined;
     resolveDir(name: string, ...paths: string[]): string | undefined;
-    locateSourceFiles(file: ExternalAsset, code?: string, bundleContent?: string[]): (imports?: Record<string, string | undefined>) => SourceInput | undefined;
-    resolveSourceFile(file: ExternalAsset): (code?: string, imports?: Record<string, string | undefined>) => SourceInput<string> | undefined;
+    locateSourceFiles(file: ExternalAsset, code?: string, bundleContent?: string[]): ((imports?: Record<string, string | undefined>) => SourceInput | undefined);
+    resolveSourceFile(file: ExternalAsset): ((code?: string, imports?: Record<string, string | undefined>) => SourceInput<string> | undefined);
     tryParse(source: string, format: string, options?: Record<string | number | symbol, unknown>): unknown;
     forDb(item: DataSource): boolean;
     hasEval(name: string): boolean;
     settingsOf(name: keyof DocumentComponent, option: keyof DocumentComponentOption): unknown;
     parseTemplate(viewEngine: ViewEngine | string, template: string, data: unknown[]): Promise<string | null>;
     transform(type: string, code: string, format: string | string[], options?: TransformOutput & TransformAction): Promise<TransformResult | void>;
-    abort(name?: keyof DocumentComponent | Error, reason?: unknown): void;
+    abort(err: Error): void;
+    abort(name?: keyof DocumentComponent, reason?: unknown): void;
     restart(): void;
     using?(data: IFileThread): Promise<unknown>;
     setLocalUri?(file: ExternalAsset, replace?: boolean): void;
@@ -72,10 +74,9 @@ interface DocumentConstructor extends ModuleConstructor {
     createSourceMap(code: string, remove: boolean): SourceMap;
     createSourceMap(code: string, uri?: string, remove?: boolean): SourceMap;
     writeSourceMap(uri: string, data: SourceCode, options?: SourceMapOptions): string | undefined;
-    updateGradle(source: string, namespaces: string[], value: string, options?: UpdateGradleOptions | boolean): string;
+    updateGradle(source: string, namespaces: string[], value: string, upgrade: boolean): string;
+    updateGradle(source: string, namespaces: string[], value: string, options?: UpdateGradleOptions): string;
     generateLintTable(messages: LintMessage[], options: GenerateLintTableOptions): LogComponent[];
-    /* @deprecated - IDocument.using */
-    using?(this: IFileManager, instance: IDocument, file: ExternalAsset): Promise<unknown>;
     cleanup?(this: IFileManager, instance: IDocument): Promise<unknown>;
     sanitizeAssets?(assets: ExternalAsset[], exclusions?: ExternalAsset[]): ExternalAsset[];
     readonly prototype: IDocument;
@@ -83,16 +84,129 @@ interface DocumentConstructor extends ModuleConstructor {
 }
 ```
 
+## Settings
+
+```typescript
+import type { PermittedDirectories } from "./core";
+import type { DbModule, DbSettings, DocumentComponentOptions, PurgeComponent } from "./settings";
+
+interface DocumentModule {
+    // handler: "@pi-r/chrome";
+    extensions?: string[];
+    db?: DbModule<DbSettings>;
+    eval?: {
+        function?: boolean;
+        absolute?: boolean;
+        template?: boolean;
+        userconfig?: boolean;
+    };
+    format?: {
+        uuid?: {
+            dictionary?: string;
+            pathname?: string;
+            filename?: string;
+        };
+    };
+    imports?: StringMap;
+    settings?: {
+        broadcast_id?: string | string[];
+        users?: Record<string, {
+            extensions?: string[] | null;
+            imports?: StringMap;
+            imports_strict?: boolean;
+            pages?: unknown;
+            transform?: unknown;
+            view_engine?: unknown;
+        }>;
+        cache_dir?: string;
+        imports_strict?: boolean;
+        directory?: {
+            template?: string;
+            data?: string;
+            export?: string;
+            schema?: string;
+            package?: string;
+        };
+        purge?: PurgeComponent;
+        options?: DocumentComponentOptions<boolean | number>;
+        pages?: Record<string, Record<string, unknown>>;
+        transform?: {
+            html?: Record<string, Record<string, unknown>>;
+            css?: Record<string, Record<string, unknown>>;
+            js?: Record<string, Record<string, unknown>>;
+        };
+        view_engine?: Record<string, Record<string, unknown>>;
+        export?: Record<string, string | (...args: unknown[]) => unknown>;
+    };
+    permission?: PermittedDirectories;
+}
+```
+
+### Example usage
+
+```javascript
+const Document = require("@e-mc/document"); // @pi-r/chrome
+
+const assets = [
+    { pathname: "output", filename: "image1.png", uri: "http://hostname/path/document1.png" },
+    { pathname: "output", filename: "image2.png", uri: "http://hostname/path/document2.png" }
+];
+
+const instance = new Document({
+    eval: {
+        function: true,
+        template: true
+    },
+    imports: {
+        "http://hostname/path/": "build/"
+    },
+    settings: {
+        imports_strict: true,
+        users: {
+            "nodejs-001": {
+                imports_strict: false,
+                imports: {
+                  "http://hostname/path": "build"
+                }
+            }
+        },
+        directory: {
+            template: "../chrome/template" // ../chrome/template/users/nodejs-001
+        }
+    }
+});
+// instance.host = new Host();
+instance.init(assets);
+```
+
+NOTE: **@e-mc/document** is an abstract base class and cannot be instantiated. **Document** is more commonly called through [@pi-r/chrome](https://www.npmjs.com/package/@pi-r/chrome).
+
+## NodeJS 14 LTS
+
+Any optional fail safe dependencies were removed as of `E-mc 0.9`. The code itself will still be *ES2020* and will continue to work equivalently when self-installing these dependencies:
+
+### Under 15.4 + 16.0
+
+```sh
+npm i abort-controller event-target-shim
+```
+
+### Under 14.17 + 15.6
+
+```sh
+  npm i uuid
+```
+
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/document.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/settings.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.6/lib/watch.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.0/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.0/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.0/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.0/lib/document.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.0/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.0/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.0/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.0/lib/watch.d.ts
 
 ## LICENSE
 

package/asset.d.ts

@@ -1,8 +1,8 @@
-import type { ExternalAsset, InitialValue } from '../types/lib/asset';
-
-declare namespace asset {
-    function isEqual(item: ExternalAsset, other: ExternalAsset): boolean;
-    function setInitialValue(file: ExternalAsset, cacheable?: boolean): InitialValue;
-}
-
+import type { ExternalAsset, InitialValue } from '../types/lib/asset';
+
+declare namespace asset {
+    function isEqual(item: ExternalAsset, other: ExternalAsset): boolean;
+    function setInitialValue(file: ExternalAsset, cacheable?: boolean): InitialValue;
+}
+
 export = asset;

package/asset.js

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.setInitialValue = exports.isEqual = void 0;
 function isEqual(item, other) {
     return !!(item.id && item.id === other.id || item.uri === other.uri && item.pathname === other.pathname && item.filename === other.filename && item.pathname && item.filename);

package/index.d.ts

@@ -1,5 +1,5 @@
-import type { DocumentConstructor, IFileManager } from '../types/lib';
-
-declare const Document: DocumentConstructor<IFileManager>;
-
+import type { DocumentConstructor, IFileManager } from '../types/lib';
+
+declare const Document: DocumentConstructor<IFileManager>;
+
 export = Document;

package/index.js

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
 const pm = require("picomatch");
@@ -34,6 +33,48 @@ function deleteTransform(map, key, timeout) {
     delete map[key];
     --CACHE_TOTAL;
 }
+function resetTransform(config, map, key, stored) {
+    if (config.renew) {
+        if (stored.timeout) {
+            clearTimeout(stored.timeout);
+        }
+        stored.timeout = renewTransform(map, key, config.expires);
+    }
+    stored.lastAccessed = Date.now();
+}
+function getTransformData(stored, key, encoding) {
+    const location = stored.format[key];
+    if (typeof location === 'string') {
+        try {
+            return JSON.parse(fs.readFileSync(location, encoding));
+        }
+        catch {
+            fs.unlink(location, () => { });
+            return;
+        }
+    }
+    return location;
+}
+function setTransformData(type, cacheDir, data) {
+    let pathname;
+    if (typeof cacheDir === 'string' && core_1.Client.createDir(pathname = path.join(cacheDir, 'transform', type))) {
+        try {
+            fs.writeFileSync(pathname = path.join(pathname, (0, types_1.incrementUUID)()), JSON.stringify(data));
+            return pathname;
+        }
+        catch {
+        }
+    }
+    return data;
+}
+function hasTransformType(config, type, name, data) {
+    const include = config?.include[type];
+    if (include === true || include?.includes(name)) {
+        const exclude = config.exclude[type];
+        return !exclude || exclude === true && include !== true || Array.isArray(exclude) && !exclude.includes(name);
+    }
+    return data?.override === true;
+}
 function getSourceMappingURL(value, css) {
     if (value.includes(' ')) {
         value = encodeURIComponent(value);
@@ -91,7 +132,7 @@ class Document extends core_1.Client {
     static async finalize(instance) {
         for (const ext of instance.extensions) {
             if (instance.aborted) {
-                return Promise.reject((0, types_1.createAbortError)());
+                return (0, types_1.createAbortError)(true);
             }
             try {
                 const args = [instance];
@@ -218,7 +259,7 @@ class Document extends core_1.Client {
             let match;
             while (match = pattern.exec(source)) {
                 const preceding = source.substring(lastIndex, match.index);
-                let opening = 0, closing = namespaces.length - 1;
+                let opening = 0, closing = 0;
                 for (let j = 0, q = preceding.length; j < q; ++j) {
                     switch (preceding[j]) {
                         case '{':
@@ -229,8 +270,11 @@ class Document extends core_1.Client {
                             break;
                     }
                 }
-                if (opening === closing && (!multiple || match[1] && sanitizeValue(match[1]) === sanitizeValue(local[3]))) {
-                    return upgrade ? parse_1.XmlWriter.replaceMatch(match, source, value, pattern) : source;
+                if (opening === closing) {
+                    if (!multiple || match[1] && sanitizeValue(match[1]) === sanitizeValue(local[3])) {
+                        return upgrade ? parse_1.XmlWriter.replaceMatch(match, source, value, pattern) : source;
+                    }
+                    lastIndex = match.index + match[0].length;
                 }
             }
             return spliceSource(source, lastIndex, lastIndex, ident.repeat(length) + value + newline);
@@ -311,7 +355,6 @@ class Document extends core_1.Client {
     constructor(data) {
         super(data);
         this.Db = null;
-        this.config = {};
         this._assets = null;
         this._dataSource = null;
         this._transformConfig = null;
@@ -388,7 +431,7 @@ class Document extends core_1.Client {
             const handler = db.handler;
             const database = this.dataSource.filter(this.forDb.bind(this));
             let instance;
-            if ((0, types_1.isString)(handler) && handler !== "@e-mc/db") {
+            if (handler && handler !== "@e-mc/db") {
                 try {
                     const Handler = require(handler);
                     if (isFunction(Handler) && Handler.prototype instanceof core_1.ClientDb) {
@@ -403,7 +446,7 @@ class Document extends core_1.Client {
                 }
             }
             else {
-                instance = new db_1.default(db, database);
+                instance = new db_1(db, database);
             }
             if (instance) {
                 const host = this.host;
@@ -780,7 +823,7 @@ class Document extends core_1.Client {
             if (Document.isFile(href, 'unc') || path.isAbsolute(href)) {
                 sourceFile.push([href]);
             }
-            else if (imports && Object.keys(imports).length) {
+            else if (Object.keys(imports).length) {
                 const bundleId = file.bundleId;
                 const assets = !(0, types_1.isEmpty)(bundleId) ? this.assets.filter(item => item.bundleId === bundleId).sort((a, b) => a.bundleIndex - b.bundleIndex) : [file];
                 if (!Array.isArray(bundleContent) || bundleContent.length !== assets.length - 1) {
@@ -800,7 +843,7 @@ class Document extends core_1.Client {
                                 if (this.resolveUri && (0, types_1.isArray)(file.trailingContent)) {
                                     let trailing;
                                     [source, trailing] = this.resolveUri(file, source, (0, util_1.concatString)(file.trailingContent));
-                                    if ((0, types_1.isString)(trailing)) {
+                                    if (trailing) {
                                         source += trailing;
                                     }
                                 }
@@ -829,7 +872,7 @@ class Document extends core_1.Client {
         return (code, imports = this.imports) => {
             const uri = file.uri;
             let source, sourceFile;
-            if (code && imports && Object.keys(imports).length) {
+            if (code && Object.keys(imports).length) {
                 const output = this.resolveImports?.(file, code, uri && this.findSourceRoot(uri, imports));
                 if (output) {
                     source = output;
@@ -962,54 +1005,32 @@ class Document extends core_1.Client {
         return null;
     }
     async transform(type, code, format, options = {}) {
+        var _a, _b, _c;
         let transform = this.settings.transform, data;
-        if (!transform || !(0, types_1.isObject)(data = transform[type])) {
+        if (!(transform && (0, types_1.isObject)(data = transform[type]))) {
             return;
         }
         format = typeof format === 'string' ? format.trim().split(/\s*\+\s*/) : format.map(item => typeof item === 'string' ? item.trim() : '');
-        const moduleName = this.moduleName;
         const username = this.host?.username || '';
         const config = this._transformConfig;
         const cacheData = config && options.cacheData;
-        const cacheType = username && core_1.Client.enabled("memory.settings.users", username) ? true : this.cacheDir || core_1.Client.enabled("memory.settings.users");
-        let formatKey, hashKey, excludeKey;
-        if (cacheData && cacheType && !CACHE_EXTERNAL[excludeKey = moduleName + '_' + type + '_' + format] && (!config.exclude[type] || Array.isArray(config.exclude[type]) && !format.some(value => config.exclude[type].includes(value)) || Array.isArray(config.include[type]) && format.every(value => config.include[type].includes(value)))) {
+        const cacheDir = username && core_1.Client.enabled("memory.settings.users", username) ? true : this.cacheDir || core_1.Client.enabled("memory.settings.users");
+        let formatKey = '', hashKey, excludeKey;
+        if (cacheData && cacheDir && !CACHE_EXTERNAL[excludeKey = this.moduleName + '_' + type + '_' + format] && (!config.exclude[type] || Array.isArray(config.exclude[type]) && !format.some(value => config.exclude[type].includes(value)) || Array.isArray(config.include[type]) && format.every(value => config.include[type].includes(value)))) {
             const { uri, etag } = cacheData;
             const encoding = (0, types_1.getEncoding)(cacheData.encoding);
             const algorithm = config.algorithm;
             let result, cacheName;
             formatKey = type + '_' + format + '_' + encoding + (username ? '_' + username : '') + core_1.Client.asString(options.external) + core_1.Client.asString(options.metadata);
-            const resetTimeout = (map, key, stored) => {
-                if (config.renew) {
-                    if (stored.timeout) {
-                        clearTimeout(stored.timeout);
-                    }
-                    stored.timeout = renewTransform(map, key, config.expires);
-                }
-                stored.lastAccessed = Date.now();
-            };
-            const getData = (stored) => {
-                const location = stored.format[formatKey];
-                if (typeof location === 'string') {
-                    try {
-                        return JSON.parse(fs.readFileSync(location, encoding));
-                    }
-                    catch {
-                        fs.unlink(location, () => { });
-                        return;
-                    }
-                }
-                return location;
-            };
             if (config.etag && etag && uri) {
-                const etagMap = CACHE_ETAG[moduleName] || (CACHE_ETAG[moduleName] = {});
+                const etagMap = CACHE_ETAG[_a = this.moduleName] || (CACHE_ETAG[_a] = {});
                 const stored = etagMap[uri];
                 if (stored) {
                     if (stored.etag !== etag) {
                         deleteTransform(etagMap, uri, stored.timeout);
                     }
-                    else if (result = getData(stored)) {
-                        resetTimeout(etagMap, uri, stored);
+                    else if (result = getTransformData(stored, formatKey, encoding)) {
+                        resetTransform(config, etagMap, uri, stored);
                         cacheName = 'etag';
                     }
                 }
@@ -1018,10 +1039,10 @@ class Document extends core_1.Client {
                 if (algorithm) {
                     const limit = config.limit;
                     if ((limit === Infinity || limit > 0 && Buffer.byteLength(code, encoding) <= limit) && (hashKey = core_1.Client.asHash(code, { algorithm, encoding }))) {
-                        const hashMap = CACHE_HASH[moduleName] || (CACHE_HASH[moduleName] = {});
+                        const hashMap = CACHE_HASH[_b = this.moduleName] || (CACHE_HASH[_b] = {});
                         const stored = hashMap[hashKey];
-                        if (stored && (result = getData(stored))) {
-                            resetTimeout(hashMap, hashKey, stored);
+                        if (stored && (result = getTransformData(stored, formatKey, encoding))) {
+                            resetTransform(config, hashMap, hashKey, stored);
                             cacheName = algorithm;
                         }
                     }
@@ -1030,14 +1051,14 @@ class Document extends core_1.Client {
                     }
                 }
                 else if (uri) {
-                    const codeMap = CACHE_CODE[moduleName] || (CACHE_CODE[moduleName] = {});
+                    const codeMap = CACHE_CODE[_c = this.moduleName] || (CACHE_CODE[_c] = {});
                     const stored = codeMap[uri];
                     if (stored) {
                         if (stored.code !== code) {
                             deleteTransform(codeMap, uri, stored.timeout);
                         }
-                        else if (result = getData(stored)) {
-                            resetTimeout(codeMap, uri, stored);
+                        else if (result = getTransformData(stored, formatKey, encoding)) {
+                            resetTransform(config, codeMap, uri, stored);
                         }
                     }
                 }
@@ -1062,18 +1083,10 @@ class Document extends core_1.Client {
             userData = transform[type];
             userImports = transform.imports;
         }
-        const abort = () => {
+        const abortTransform = () => {
             ignoreCache = true;
             this.abort('transform');
         };
-        const includes = (name) => {
-            const include = config?.include[type];
-            if (include === true || include?.includes(name)) {
-                const exclude = config.exclude[type];
-                return !exclude || exclude === true && include !== true || Array.isArray(exclude) && !exclude.includes(name);
-            }
-            return cacheData?.override === true;
-        };
         for (let i = 0, length = format.length, name; i < length; ++i) {
             if (this.aborted) {
                 break;
@@ -1107,7 +1120,7 @@ class Document extends core_1.Client {
                 }
             }
             if (!baseSettings) {
-                excluded = !includes(name);
+                excluded = !hasTransformType(config, type, name, cacheData);
             }
             outputConfig || (outputConfig = {});
             if (plugin && baseConfig) {
@@ -1130,7 +1143,7 @@ class Document extends core_1.Client {
                     else if (source !== value) {
                         series.code = value;
                         valid = true;
-                        if (out.ignoreCache && !includes(name)) {
+                        if (out.ignoreCache && !hasTransformType(config, type, name, cacheData)) {
                             ignoreCache = true;
                         }
                         if ((0, types_1.isArray)(out.sourceFiles)) {
@@ -1192,7 +1205,7 @@ class Document extends core_1.Client {
                         if (!transformer) {
                             try {
                                 let pkg = this.resolveDir('package', plugin + '.js') || userImports?.[plugin] || imports[plugin] || util_1.IMPORTS[plugin];
-                                if ((0, types_1.isString)(pkg)) {
+                                if (pkg) {
                                     const match = /^(@?\S+)@(\d+(?:\.\d+(?:\.\S+)?)?|[a-z]+)$/.exec(pkg);
                                     if (match) {
                                         pkg = match[1];
@@ -1203,20 +1216,19 @@ class Document extends core_1.Client {
                                 else {
                                     transformer = context;
                                     context = this;
-                                    pkg = undefined;
-                                }
-                                if (transformer && typeof transformer !== 'function') {
-                                    transformer = transformer.default;
                                 }
                                 if (typeof transformer !== 'function') {
-                                    throw (0, types_1.errorMessage)(plugin, pkg || name, 'Invalid function');
+                                    transformer && (transformer = transformer.default);
+                                    if (typeof transformer !== 'function') {
+                                        throw (0, types_1.errorMessage)(plugin, pkg || name, 'Invalid function');
+                                    }
                                 }
                                 if (pkg) {
                                     CACHE_PACKAGE[plugin + username] = transformer;
                                 }
                             }
                             catch (err) {
-                                abort();
+                                abortTransform();
                                 this.writeFail(["Unknown", username ? plugin + ':' + username : hint], err, { type: 4, startTime });
                                 continue;
                             }
@@ -1226,7 +1238,7 @@ class Document extends core_1.Client {
                     }
                 }
                 catch (err) {
-                    abort();
+                    abortTransform();
                     this.checkPackage(err, (0, util_1.getModuleName)(err), ["Unable to transform document", hint], { type: 4, startTime });
                     if (i < length - 1) {
                         series.reset();
@@ -1234,7 +1246,7 @@ class Document extends core_1.Client {
                 }
             }
             else {
-                abort();
+                abortTransform();
                 if (plugin) {
                     this.writeFail("Unable to load configuration", (0, types_1.errorMessage)(plugin, name, 'Invalid config'), 4);
                 }
@@ -1269,55 +1281,43 @@ class Document extends core_1.Client {
             const { uri, etag } = cacheData;
             const formatData = { ...output, storedLog };
             const lastAccessed = Date.now();
-            const setData = () => {
-                let pathname;
-                if (typeof cacheType === 'string' && core_1.Client.createDir(pathname = path.join(cacheType, 'transform', type))) {
-                    try {
-                        fs.writeFileSync(pathname = path.join(pathname, (0, types_1.incrementUUID)()), JSON.stringify(formatData));
-                        return pathname;
-                    }
-                    catch {
-                    }
-                }
-                return formatData;
-            };
             if (config.etag && etag && uri) {
-                const etagMap = CACHE_ETAG[moduleName];
+                const etagMap = CACHE_ETAG[this.moduleName];
                 const stored = etagMap[uri];
                 if (stored) {
                     if (stored.etag === etag) {
-                        stored.format[formatKey] = setData();
+                        stored.format[formatKey] = setTransformData(type, cacheDir, formatData);
                         stored.lastAccessed = lastAccessed;
                         return output;
                     }
                     deleteTransform(etagMap, uri, stored.timeout);
                 }
-                etagMap[uri] = { lastAccessed, etag, timeout: renewTransform(etagMap, uri, config.expires), format: { [formatKey]: setData() } };
+                etagMap[uri] = { lastAccessed, etag, timeout: renewTransform(etagMap, uri, config.expires), format: { [formatKey]: setTransformData(type, cacheDir, formatData) } };
                 ++CACHE_TOTAL;
             }
             else if (hashKey) {
-                const hashMap = CACHE_HASH[moduleName];
+                const hashMap = CACHE_HASH[this.moduleName];
                 const stored = hashMap[hashKey];
                 if (stored) {
-                    stored.format[formatKey] = setData();
+                    stored.format[formatKey] = setTransformData(type, cacheDir, formatData);
                     stored.lastAccessed = lastAccessed;
                     return output;
                 }
-                hashMap[hashKey] = { lastAccessed, timeout: renewTransform(hashMap, hashKey, config.expires), format: { [formatKey]: setData() } };
+                hashMap[hashKey] = { lastAccessed, timeout: renewTransform(hashMap, hashKey, config.expires), format: { [formatKey]: setTransformData(type, cacheDir, formatData) } };
                 ++CACHE_TOTAL;
             }
             else if (uri) {
-                const codeMap = CACHE_CODE[moduleName];
+                const codeMap = CACHE_CODE[this.moduleName];
                 const stored = codeMap[uri];
                 if (stored) {
                     if (stored.code === code) {
-                        stored.format[formatKey] = setData();
+                        stored.format[formatKey] = setTransformData(type, cacheDir, formatData);
                         stored.lastAccessed = lastAccessed;
                         return output;
                     }
                     deleteTransform(codeMap, uri, stored.timeout);
                 }
-                codeMap[uri] = { lastAccessed, code, timeout: renewTransform(codeMap, uri, config.expires), format: { [formatKey]: setData() } };
+                codeMap[uri] = { lastAccessed, code, timeout: renewTransform(codeMap, uri, config.expires), format: { [formatKey]: setTransformData(type, cacheDir, formatData) } };
                 ++CACHE_TOTAL;
             }
         }
@@ -1364,18 +1364,11 @@ class Document extends core_1.Client {
         }
     }
     get imports() {
-        if (!this._imports) {
-            this.imports = {};
-        }
-        return this._imports;
+        return this._imports || (this._imports = {});
     }
     get watching() {
         return this.assets.some(item => item.watch);
     }
 }
-exports.default = Document;
 
-if (exports.default) {
-    module.exports = exports.default;
-    module.exports.default = exports.default;
-}
+module.exports = Document;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/document",
-  "version": "0.8.6",
+  "version": "0.9.0",
   "description": "Document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,12 +20,12 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.8.6",
-    "@e-mc/db": "0.8.6",
-    "@e-mc/types": "0.8.6",
+    "@e-mc/core": "0.9.0",
+    "@e-mc/db": "0.9.0",
+    "@e-mc/types": "0.9.0",
     "chalk": "4.1.2",
     "htmlparser2": "^9.1.0",
     "js-yaml": "^4.1.0",
-    "picomatch": "^3.0.1"
+    "picomatch": "^4.0.2"
   }
 }

package/parse/dom.js

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.IGNORE_FLAG = exports.HtmlElement = exports.DomWriter = void 0;
 const htmlparser2 = require("htmlparser2");
 const domhandler = require("domhandler");
@@ -82,7 +81,6 @@ class DomWriter extends index_1.XmlWriter {
                 pattern.lastIndex += tag.length - match[0].length;
             }
         }
-        pattern.lastIndex = 0;
         return source;
     }
     static getDocumentElement(source, parser) {

package/parse/index.js

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.XmlElement = exports.XmlWriter = exports.IGNORE_FLAG = void 0;
 const htmlparser2 = require("htmlparser2");
 const domhandler = require("domhandler");
@@ -1047,7 +1046,7 @@ class XmlElement {
             if (value === null) {
                 continue;
             }
-            result += '="' + (typeof value === 'string' ? escapeEntities ? XmlWriter.escapeXmlString(value) : value.replace(/"/g, '"') : module_1.default.asString(value)) + '"';
+            result += '="' + (typeof value === 'string' ? escapeEntities ? XmlWriter.escapeXmlString(value) : value.replace(/"/g, '"') : module_1.asString(value)) + '"';
         }
         return result;
     }

package/parse/types/index.d.ts

@@ -127,7 +127,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: StringOfArray): void;
+    ignoreTag(value: ArrayOf<string>): void;
     resetPosition(startIndex?: number): void;
     getElementById(id: string, ignoreCase?: boolean, options?: TagNodeByIdOptions): Undef<SourceTagNode>;
     getElementsByTagName(tagName: string, ignoreCase?: boolean, options?: TagNodeOptions): SourceTagNode[];
@@ -165,7 +165,7 @@ export interface XmlWriterConstructor {
     getNameOfId(document: string): string;
     getPatternId(name: string): RegExp;
     getCommentsAndCDATA(source: string, tagPattern: unknown, ignoreCase: boolean, stripXml: true): string;
-    getCommentsAndCDATA(source: string, tagPattern?: StringOfArray | [Undef<string>, Undef<string[]>], ignoreCase?: boolean, stripXml?: boolean): SourceContent[];
+    getCommentsAndCDATA(source: string, tagPattern?: ArrayOf<string> | [Undef<string>, Undef<string[]>], ignoreCase?: boolean, stripXml?: boolean): SourceContent[];
     isEqual(node: XmlTagNode, other: XmlTagNode, ignoreCase: boolean): boolean;
     isEqual(node: XmlTagNode, other: XmlTagNode, documentName?: string, ignoreCase?: boolean): boolean;
     isIndex(value: Undef<number>): value is number;

package/transform/index.d.ts

@@ -1,8 +1,8 @@
-import type { SourceMapConstructor, TransformSeriesConstructor } from '../../types/lib/document';
-
-declare namespace transform {
-    const TransformSeries: TransformSeriesConstructor;
-    const SourceMap: SourceMapConstructor;
-}
-
+import type { SourceMapConstructor, TransformSeriesConstructor } from '../../types/lib/document';
+
+declare namespace transform {
+    const TransformSeries: TransformSeriesConstructor;
+    const SourceMap: SourceMapConstructor;
+}
+
 export = transform;

package/transform/index.js

@@ -1,6 +1,5 @@
 "use strict";
 var _a, _b, _c, _d;
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceMap = exports.TransformSeries = void 0;
 const path = require("path");
 const types_1 = require("@e-mc/types");

package/util.js

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.isObject = exports.removeInternalProperties = exports.getModuleName = exports.hasValue = exports.getHashData = exports.getNewline = exports.getIndent = exports.appendSuffix = exports.splitEnclosing = exports.concatString = exports.replaceAll = exports.loadPlugins = exports.IMPORTS = void 0;
 const path = require("path");
 const types_1 = require("@e-mc/types");