@pi-r/chrome 0.6.7 → 0.6.9

package/LICENSE

@@ -1,7 +1,7 @@
-Copyright 2024 An Pham
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
+Copyright 2023 An Pham
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,10 +1,10 @@
-# @pi-r/chrome
-
-## Documentation
-
-- [E-mc](https://e-mc.readthedocs.io/en/latest/document/index.html)
-- [squared](https://squared.readthedocs.io)
-
-## LICENSE
-
+# @pi-r/chrome
+
+## Documentation
+
+- [E-mc](https://e-mc.readthedocs.io/en/latest/document/index.html)
+- [squared](https://squared.readthedocs.io)
+
+## LICENSE
+
 MIT

package/index.d.ts

@@ -1,7 +1,7 @@
-import type { IFileManager } from '@e-mc/types/lib';
-
-import type { ChromeDocumentConstructor, DocumentAsset } from './types';
-
-declare const Chrome: ChromeDocumentConstructor<IFileManager<DocumentAsset>>;
-
+import type { IFileManager } from '@e-mc/types/lib';
+
+import type { ChromeDocumentConstructor, DocumentAsset } from './types';
+
+declare const Chrome: ChromeDocumentConstructor<IFileManager<DocumentAsset>>;
+
 export = Chrome;

package/index.js

@@ -13,6 +13,9 @@ const CACHE_DBRESULT = new Map();
 const CACHE_LOCALFILE = new Map();
 const CACHE_QUERY = new Map();
 const CACHE_SELECTOR = new Map();
+const CACHE_ETAG = new Map();
+const CACHE_CONTENT = new Map();
+const CACHE_FORMAT = new Map();
 const CACHE_DATASET = {};
 const CACHE_ATRULES = {};
 let CACHE_TOTAL = 0;
@@ -973,6 +976,9 @@ class ChromeDocument extends Document {
             }
             CACHE_QUERY.clear();
             CACHE_SELECTOR.clear();
+            CACHE_ETAG.clear();
+            CACHE_CONTENT.clear();
+            CACHE_FORMAT.clear();
         }
         return result + (parent && result > 0 ? await super.purgeMemory(typeof parent === 'number' && parent > 0 ? parent : percent, limit, true) : 0);
     }
@@ -1000,12 +1006,27 @@ class ChromeDocument extends Document {
                             if (outHtml) {
                                 const { etag, initialValue } = htmlFile;
                                 let buffer;
-                                if (!initialValue || !(etag && initialValue.etag === etag && (buffer = initialValue.buffer)) || fetched.find(item => item.bundleReplace && (!(0, types_1.isArray)(item.from) || item.from.includes('style')))) {
+                                if (!initialValue || !(etag && initialValue.etag === etag && (buffer = initialValue.buffer)) || fetched.find(item => item !== htmlFile && item.etag && CACHE_ETAG.get(item.localUri) !== item.etag && (item.inlineContent || item.bundleReplace && (!Array.isArray(item.from) || item.from.includes('style'))))) {
+                                    const isValid = (item) => !!item.localUri && item !== htmlFile && !item.invalid;
+                                    for (const item of fetched) {
+                                        if (item.etag && !item.content && isValid(item)) {
+                                            CACHE_ETAG.set(item.localUri, item.etag);
+                                        }
+                                    }
+                                    for (const item of instance.assets) {
+                                        if (isValid(item)) {
+                                            if (item.content) {
+                                                CACHE_CONTENT.set(item.localUri, item.content);
+                                            }
+                                            if (item.format) {
+                                                CACHE_FORMAT.set(item.localUri, item.format.toString());
+                                            }
+                                        }
+                                    }
                                     break;
                                 }
                                 try {
-                                    const { localUri, encoding } = htmlFile;
-                                    fs.writeFileSync(localUri, buffer, (0, types_1.getEncoding)(encoding));
+                                    fs.writeFileSync(htmlFile.localUri, buffer, (0, types_1.getEncoding)(htmlFile.encoding));
                                     htmlFile.buffer = buffer;
                                     htmlFile.sourceUTF8 = undefined;
                                 }
@@ -1013,12 +1034,39 @@ class ChromeDocument extends Document {
                                     break;
                                 }
                             }
-                            const { jsFiles, cssFiles, svgFiles } = instance;
-                            const copiedAssets = this.copiedAssets;
-                            const wasModified = (item) => fetched.includes(item) || copiedAssets.includes(item) && (!(0, types_1.isEmpty)(item.bundleId) || !(0, types_1.isEmpty)(item.trailingContent));
-                            const js = jsFiles.filter(item => item.imports || wasModified(item));
-                            const css = cssFiles.filter(wasModified);
-                            const svg = svgFiles.filter(wasModified);
+                            const wasModified = (item) => {
+                                const localUri = item.localUri;
+                                let result = fetched.includes(item) || Array.isArray(item.from) && item.from.includes('style');
+                                if (localUri) {
+                                    if (item.etag && !item.content && !item.invalid) {
+                                        CACHE_ETAG.set(localUri, item.etag);
+                                    }
+                                    else {
+                                        CACHE_ETAG.delete(localUri);
+                                    }
+                                    if (!item.content || item.invalid) {
+                                        CACHE_CONTENT.delete(localUri);
+                                    }
+                                    else if (CACHE_CONTENT.get(localUri) !== item.content || !item.inlineContent && !Document.isPath(localUri)) {
+                                        CACHE_CONTENT.set(localUri, item.content);
+                                        result = true;
+                                    }
+                                    if (!item.format || item.invalid) {
+                                        CACHE_FORMAT.delete(localUri);
+                                    }
+                                    else {
+                                        const format = item.format.toString();
+                                        if (CACHE_FORMAT.get(localUri) !== format || !item.inlineContent && !Document.isPath(localUri)) {
+                                            CACHE_FORMAT.set(localUri, format);
+                                            result = true;
+                                        }
+                                    }
+                                }
+                                return result || this.copiedAssets.includes(item) && (!(0, types_1.isEmpty)(item.bundleId) || !(0, types_1.isEmpty)(item.trailingContent));
+                            };
+                            const js = instance.jsFiles.filter(item => wasModified(item) || !!item.imports);
+                            const css = instance.cssFiles.filter(wasModified);
+                            const svg = instance.svgFiles.filter(wasModified);
                             if (js.length || css.length || svg.length) {
                                 instance.jsFiles = js;
                                 instance.cssFiles = css;
@@ -3130,7 +3178,8 @@ class ChromeDocument extends Document {
                                                     const row = items[0];
                                                     let condition = NaN;
                                                     for (let seg of template) {
-                                                        switch ((seg = seg.trim()).toLowerCase()) {
+                                                        seg = seg.trim();
+                                                        switch (seg.toLowerCase()) {
                                                             case ':is(and)':
                                                                 if (condition === 0) {
                                                                     remove = false;
@@ -3327,7 +3376,7 @@ class ChromeDocument extends Document {
         const parseSelector = (value) => {
             const items = [];
             const revised = value.replace(useUnsafeCssReplace ? REGEXP_NTHCHILD_UNSAFE : REGEXP_NTHCHILD, (...capture) => {
-                return '`%' + (items.push('\\(' + getStringSome() + (capture[1] === '-' ? '\\x2d' : '\\x2b?') + (capture[2] || '[01]?') + (capture[3] === '0' ? !capture[1] && !capture[2] && !capture[4] && !capture[5] ? '[+-]?0[nN]?' : '0' : '[nN]') + getStringSome() + (capture[5] ? (capture[4] === '-' ? '\\x2d' : '\\x2b') + getStringSome() + capture[5] : `(?:[+-]${getStringSome()}0)?`) + (capture[6] ? getStringMany() + '[oO][fF]' + getStringMany() + capture[6].trim() : '') + getStringSome() + '\\)') - 1) + '`';
+                return '`%' + (items.push('\\(' + getStringSome() + (capture[1] === '-' ? '\\x2d' : '\\x2b?') + (capture[2] || '[01]?') + (capture[3] === '0' ? !capture[1] && !capture[2] && !capture[4] && !capture[5] ? '[+-]?0[nN]?' : '0' : '[nN]?') + getStringSome() + (capture[5] ? (capture[4] === '-' ? '\\x2d' : '\\x2b?') + getStringSome() + capture[5] : `(?:[+-]${getStringSome()}0)?`) + (capture[6] ? getStringMany() + '[oO][fF]' + getStringMany() + capture[6].trim() : '') + getStringSome() + '\\)') - 1) + '`';
             });
             let selector = '';
             for (let i = 0, length = revised.length, casing = false, attr = false, quote = false; i < length; i++) {

package/package.json

@@ -1,28 +1,28 @@
-{
-  "name": "@pi-r/chrome",
-  "version": "0.6.7",
-  "description": "Chrome document constructor for E-mc.",
-  "main": "index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/pi-r.git",
-    "directory": "src/module/chrome"
-  },
-  "keywords": [
-    "squared",
-    "e-mc",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "MIT",
-  "homepage": "https://github.com/anpham6/pi-r#readme",
-  "dependencies": {
-    "@e-mc/cloud": "^0.8.8",
-    "@e-mc/core": "^0.8.8",
-    "@e-mc/document": "^0.8.8",
-    "@e-mc/types": "^0.8.8"
-  }
-}
+{
+  "name": "@pi-r/chrome",
+  "version": "0.6.9",
+  "description": "Chrome document constructor for E-mc.",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
+    "directory": "src/module/chrome"
+  },
+  "keywords": [
+    "squared",
+    "e-mc",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/anpham6/pi-r#readme",
+  "dependencies": {
+    "@e-mc/cloud": "^0.8.24",
+    "@e-mc/core": "^0.8.24",
+    "@e-mc/document": "^0.8.24",
+    "@e-mc/types": "^0.8.24"
+  }
+}

package/types/index.d.ts

@@ -1,127 +1,127 @@
-import type { LocationUri, XmlTagNode } from '@e-mc/types/lib/squared';
-
-import type { DocumentConstructor, ICloud, IDocument, IFileManager } from '@e-mc/types/lib';
-import type { DocumentAsset as IDocumentAsset } from '@e-mc/types/lib/document';
-import type { LogTime } from '@e-mc/types/lib/logger';
-import type { DbSourceDataType, DocumentComponentOption, DocumentComponent as IDocumentComponent, DocumentComponentOptions as IDocumentComponentOptions, DocumentDirectory as IDocumentDirectory, DocumentEval as IDocumentEval, DocumentModule as IDocumentModule, DocumentSettings as IDocumentSettings } from '@e-mc/types/lib/settings';
-
-import type { CloudScopeOrigin } from '@e-mc/cloud/types';
-import type { IDomWriter, IXmlElement } from '@e-mc/document/parse/types';
-
-import type { ChromeAsset, CssRuleData, DataSource, DocumentOutput } from './squared';
-
-export const enum PROPERTIES {
-    INDEX = '__index__',
-    FROM_HTML = '__fromhtml__',
-    ASSIGN = '__assign__',
-    SERVERROOT = '__serverroot__'
-}
-
-interface DocumentDirectory extends IDocumentDirectory {
-    template?: string;
-    data?: string;
-    export?: string;
-    schema?: string;
-    sql?: string;
-}
-
-interface DocumentComponentExtended<T> extends DbSourceDataType<T> {
-    json?: T;
-    uri?: T;
-    local?: T;
-    export?: T;
-}
-
-interface DocumentComponentOptions<T> extends IDocumentComponentOptions, DocumentComponentExtended<DocumentComponentOption<T>> {}
-
-interface DocumentEval extends IDocumentEval {
-    template?: boolean;
-    userconfig?: boolean;
-}
-
-interface ChromeDocumentSettings extends IDocumentSettings {
-    directory?: DocumentDirectory;
-    options?: DocumentComponentOptions<boolean | number>;
-    export?: ObjectMap<string | FunctionType>;
-}
-
-type OutputType = "useUnsafeReplace" | "productionRelease" | "productionIncremental" | "templateMap" | "userAgentData";
-
-export interface FormatUri extends Partial<LocationUri> {
-    dictionary?: string;
-}
-
-export interface FinalizeProcessing<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> {
-    readonly host: T;
-    readonly startTime: LogTime;
-    readonly hashed: Set<DocumentAsset>;
-    readonly contentMap: StringMap;
-    readonly bufferMap: ObjectMap<BufferContent>;
-    readonly cacheMiss: string[];
-    readonly productionRelease: Undef<true>;
-}
-
-export interface DocumentComponent<T = boolean> extends IDocumentComponent<T, T>, DocumentComponentExtended<T> {}
-
-export interface DocumentModule extends IDocumentModule {
-    eval?: DocumentEval;
-    format?: PlainObject & { uuid?: FormatUri };
-    settings?: ChromeDocumentSettings;
-}
-
-export interface DocumentAsset extends IDocumentAsset, ChromeAsset {
-    relativeUrl?: string;
-    inlineFilename?: string;
-    srcSet?: string[];
-    inlineUrl?: string;
-    inlineUrlMap?: StringMap;
-    inlineUrlCloud?: string;
-    inlineUrlCloudMap?: StringMap;
-    inlineBase64?: string;
-    modified?: boolean;
-}
-
-export interface UserConfig extends CssRuleData, Omit<DocumentOutput, OutputType> {
-    useUnsafeHtmlReplace?: boolean;
-    useUnsafeCssReplace?: boolean;
-}
-
-export interface IChromeDocument<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset, V extends ICloud = ICloud<T>> extends IDocument<T, U, DocumentModule, DocumentComponent, DocumentComponentOption, V>, Pick<DocumentOutput, OutputType> {
-    htmlFile: Null<U>;
-    cssFiles: U[];
-    jsFiles: U[];
-    svgFiles: U[];
-    baseDirectory: string;
-    baseUrl: string;
-    config: UserConfig;
-    related: Map<U, Set<U>>;
-    replaced: U[];
-    formatMap?: ObjectMap<FormatUri>;
-    setElementSrc(asset: U, element: IXmlElement, value: string): void;
-    findDataValue(name: string): Undef<string>;
-    setInlinedAttributes(processing: FinalizeProcessing<T, U>): void;
-    applyTransforms(processing: FinalizeProcessing<T, U>): Promise<void>;
-    rewriteHtml(processing: FinalizeProcessing<T, U>): Promise<void>;
-    setElementAttributes(processing: FinalizeProcessing<T, U>, domBase: IDomWriter): Promise<void>;
-    applyDataSource(processing: FinalizeProcessing<T, U>, domBase: IDomWriter): Promise<void>;
-    setProductionAttributes(processing: FinalizeProcessing<T, U>): void;
-    removeUnusedStyles(source: string, options?: UserConfig): Undef<string>;
-    removeServerRoot(value: string): string;
-    replaceContent(source: string, match: RegExpExecArray | string, mimeType?: string): Undef<string>;
-    cloudInit(state: CloudScopeOrigin<T, U, V>): void;
-    cloudObject(state: CloudScopeOrigin<T, U, V>, file: U): boolean;
-    cloudUpload(state: CloudScopeOrigin<T, U, V>, file: U, url: string, active: boolean): Promise<boolean>;
-    cloudFinalize(state: CloudScopeOrigin<T, U, V>): Promise<unknown[]>;
-    get editing(): U[];
-    set dataSource(value);
-    get dataSource(): DataSource[];
-    get elements(): XmlTagNode[];
-    get settings(): ChromeDocumentSettings;
-}
-
-export interface ChromeDocumentConstructor<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends DocumentConstructor<T, U> {
-    INTERNAL_ASSIGNUUID: string;
-    INTERNAL_SERVERROOT: string;
-    readonly prototype: IChromeDocument<T, U>;
-    new(module?: DocumentModule, ...args: unknown[]): IChromeDocument<T, U>;
+import type { LocationUri, XmlTagNode } from '@e-mc/types/lib/squared';
+
+import type { DocumentConstructor, ICloud, IDocument, IFileManager } from '@e-mc/types/lib';
+import type { DocumentAsset as IDocumentAsset } from '@e-mc/types/lib/document';
+import type { LogTime } from '@e-mc/types/lib/logger';
+import type { DbSourceDataType, DocumentComponentOption, DocumentComponent as IDocumentComponent, DocumentComponentOptions as IDocumentComponentOptions, DocumentDirectory as IDocumentDirectory, DocumentEval as IDocumentEval, DocumentModule as IDocumentModule, DocumentSettings as IDocumentSettings } from '@e-mc/types/lib/settings';
+
+import type { CloudScopeOrigin } from '@e-mc/cloud/types';
+import type { IDomWriter, IXmlElement } from '@e-mc/document/parse/types';
+
+import type { ChromeAsset, CssRuleData, DataSource, DocumentOutput } from './squared';
+
+export const enum PROPERTIES {
+    INDEX = '__index__',
+    FROM_HTML = '__fromhtml__',
+    ASSIGN = '__assign__',
+    SERVERROOT = '__serverroot__'
+}
+
+interface DocumentDirectory extends IDocumentDirectory {
+    template?: string;
+    data?: string;
+    export?: string;
+    schema?: string;
+    sql?: string;
+}
+
+interface DocumentComponentExtended<T> extends DbSourceDataType<T> {
+    json?: T;
+    uri?: T;
+    local?: T;
+    export?: T;
+}
+
+interface DocumentComponentOptions<T> extends IDocumentComponentOptions, DocumentComponentExtended<DocumentComponentOption<T>> {}
+
+interface DocumentEval extends IDocumentEval {
+    template?: boolean;
+    userconfig?: boolean;
+}
+
+interface ChromeDocumentSettings extends IDocumentSettings {
+    directory?: DocumentDirectory;
+    options?: DocumentComponentOptions<boolean | number>;
+    export?: ObjectMap<string | FunctionType>;
+}
+
+type OutputType = "useUnsafeReplace" | "productionRelease" | "productionIncremental" | "templateMap" | "userAgentData";
+
+export interface FormatUri extends Partial<LocationUri> {
+    dictionary?: string;
+}
+
+export interface FinalizeProcessing<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> {
+    readonly host: T;
+    readonly startTime: LogTime;
+    readonly hashed: Set<DocumentAsset>;
+    readonly contentMap: StringMap;
+    readonly bufferMap: ObjectMap<BufferContent>;
+    readonly cacheMiss: string[];
+    readonly productionRelease: Undef<true>;
+}
+
+export interface DocumentComponent<T = boolean> extends IDocumentComponent<T, T>, DocumentComponentExtended<T> {}
+
+export interface DocumentModule extends IDocumentModule {
+    eval?: DocumentEval;
+    format?: PlainObject & { uuid?: FormatUri };
+    settings?: ChromeDocumentSettings;
+}
+
+export interface DocumentAsset extends IDocumentAsset, ChromeAsset {
+    relativeUrl?: string;
+    inlineFilename?: string;
+    srcSet?: string[];
+    inlineUrl?: string;
+    inlineUrlMap?: StringMap;
+    inlineUrlCloud?: string;
+    inlineUrlCloudMap?: StringMap;
+    inlineBase64?: string;
+    modified?: boolean;
+}
+
+export interface UserConfig extends CssRuleData, Omit<DocumentOutput, OutputType> {
+    useUnsafeHtmlReplace?: boolean;
+    useUnsafeCssReplace?: boolean;
+}
+
+export interface IChromeDocument<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset, V extends ICloud = ICloud<T>> extends IDocument<T, U, DocumentModule, DocumentComponent, DocumentComponentOption, V>, Pick<DocumentOutput, OutputType> {
+    htmlFile: Null<U>;
+    cssFiles: U[];
+    jsFiles: U[];
+    svgFiles: U[];
+    baseDirectory: string;
+    baseUrl: string;
+    config: UserConfig;
+    related: Map<U, Set<U>>;
+    replaced: U[];
+    formatMap?: ObjectMap<FormatUri>;
+    setElementSrc(asset: U, element: IXmlElement, value: string): void;
+    findDataValue(name: string): Undef<string>;
+    setInlinedAttributes(processing: FinalizeProcessing<T, U>): void;
+    applyTransforms(processing: FinalizeProcessing<T, U>): Promise<void>;
+    rewriteHtml(processing: FinalizeProcessing<T, U>): Promise<void>;
+    setElementAttributes(processing: FinalizeProcessing<T, U>, domBase: IDomWriter): Promise<void>;
+    applyDataSource(processing: FinalizeProcessing<T, U>, domBase: IDomWriter): Promise<void>;
+    setProductionAttributes(processing: FinalizeProcessing<T, U>): void;
+    removeUnusedStyles(source: string, options?: UserConfig): Undef<string>;
+    removeServerRoot(value: string): string;
+    replaceContent(source: string, match: RegExpExecArray | string, mimeType?: string): Undef<string>;
+    cloudInit(state: CloudScopeOrigin<T, U, V>): void;
+    cloudObject(state: CloudScopeOrigin<T, U, V>, file: U): boolean;
+    cloudUpload(state: CloudScopeOrigin<T, U, V>, file: U, url: string, active: boolean): Promise<boolean>;
+    cloudFinalize(state: CloudScopeOrigin<T, U, V>): Promise<unknown[]>;
+    get editing(): U[];
+    set dataSource(value);
+    get dataSource(): DataSource[];
+    get elements(): XmlTagNode[];
+    get settings(): ChromeDocumentSettings;
+}
+
+export interface ChromeDocumentConstructor<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends DocumentConstructor<T, U> {
+    INTERNAL_ASSIGNUUID: string;
+    INTERNAL_SERVERROOT: string;
+    readonly prototype: IChromeDocument<T, U>;
+    new(module?: DocumentModule, ...args: unknown[]): IChromeDocument<T, U>;
 }

package/types/squared.d.ts

@@ -1,129 +1,129 @@
-import type { AttributeAction, ConditionProperty, CssConditionData, ElementAction, ExcludeAction, FileAsset, FromAction, HashAction, DataSource as IDataSource, ImportAction, MetadataAction, ViewEngine, XmlTagNode } from '@e-mc/types/lib/squared';
-
-import type { UploadAction } from '@e-mc/types/lib/cloud';
-import type { CascadeAction, DbSource } from '@e-mc/types/lib/db';
-import type { RequestData as IRequestData } from '@e-mc/types/lib/node';
-import type { BufferFormat } from '@e-mc/types/lib/request';
-
-interface ImportFrom {
-    placeholder: string;
-    original: string;
-    uri: string;
-    type?: string;
-    dynamic?: boolean;
-}
-
-interface DataObject extends CascadeAction {
-    format?: BufferFormat;
-    options?: PlainObject;
-}
-
-export interface UserAgentData {
-    platform: string;
-    brand: string;
-    browser: number;
-    version: Null<number[]>;
-}
-
-export interface DocumentOutput {
-    productionRelease?: boolean | string;
-    productionIncremental?: boolean;
-    useOriginalHtmlPage?: boolean | string;
-    useUnsafeReplace?: ArrayOf<"html" | "css"> | boolean;
-    useSessionCache?: boolean;
-    stripCommentsAndCDATA?: boolean | string;
-    normalizeHtmlOutput?: boolean | string;
-    escapeReservedCharacters?: boolean;
-    ignoreServerCodeBlocks?: string[];
-    webBundle?: {
-        rootDirAlias?: string;
-        baseUrl?: string;
-        primaryUrl?: string;
-        copyTo?: string;
-        rewriteHtmlPage?: boolean | string;
-        excludeHtmlPage?: boolean;
-        excludeTransforms?: boolean;
-        includeScopes?: string[];
-        excludeScopes?: string[];
-    };
-    templateMap?: TemplateMap;
-    userAgentData?: Partial<UserAgentData>;
-}
-
-export interface RequestData extends IRequestData<ChromeAsset>, Readonly<DocumentOutput>, Readonly<CssRuleData> {}
-
-export interface ChromeAsset extends FileAsset, AttributeAction, ElementAction, MetadataAction<PlainObject>, UploadAction, HashAction, ExcludeAction, ImportAction<ImportFrom[] | boolean>, FromAction {
-    preserve?: boolean;
-    static?: boolean;
-    editing?: boolean;
-    inlineContent?: string;
-    originAddress?: boolean;
-}
-
-export interface TemplateMap extends PlainObject {
-    html?: ObjectMap<StringMap>;
-    js?: ObjectMap<StringMap>;
-    css?: ObjectMap<StringMap>;
-    data?: StringMap;
-}
-
-export interface CssRuleData {
-    usedVariables?: string[];
-    usedFontFace?: string[];
-    usedKeyframes?: string[];
-    unusedStyles?: string[];
-    unusedMedia?: string[];
-    unusedContainer?: string[];
-    unusedSupports?: string[];
-    unusedAtRules?: UnusedAtRule[];
-}
-
-export interface UnusedAtRule {
-    selector?: string;
-    media?: ConditionProperty;
-    supports?: ConditionProperty;
-    container?: CssConditionData & Partial<ConditionProperty>;
-    layer?: string[];
-}
-
-export interface DataSource<T = string> extends IDataSource<T>, ElementAction {
-    source: "cloud" | "json" | "uri" | "local" | "export" | DbSource;
-    element?: XmlTagNode;
-    type?: "text" | "attribute" | "display";
-    dynamic?: boolean;
-    value?: StringOfArray | ObjectMap<unknown>;
-    template?: string;
-    viewEngine?: ViewEngine | string;
-    ignoreEmpty?: boolean;
-}
-
-export interface TextDataSource extends DataSource {
-    type: "text";
-    leadingText?: string;
-    trailingText?: string;
-}
-
-export interface UriDataSource extends DataSource, DataObject {
-    source: "uri";
-    body?: unknown;
-    contentType?: string;
-}
-
-export interface LocalDataSource extends DataSource, DataObject {
-    source: "local";
-    pathname?: string;
-}
-
-export interface JSONDataSource extends DataSource, CascadeAction {
-    source: "json";
-    items?: unknown;
-}
-
-export interface ExportDataSource extends DataSource, CascadeAction {
-    source: "export";
-    execute?: FunctionType;
-    pathname?: string;
-    settings?: string;
-    params?: unknown;
-    persist?: boolean;
+import type { AttributeAction, ConditionProperty, CssConditionData, ElementAction, ExcludeAction, FileAsset, FromAction, HashAction, DataSource as IDataSource, ImportAction, MetadataAction, ViewEngine, XmlTagNode } from '@e-mc/types/lib/squared';
+
+import type { UploadAction } from '@e-mc/types/lib/cloud';
+import type { CascadeAction, DbSource } from '@e-mc/types/lib/db';
+import type { RequestData as IRequestData } from '@e-mc/types/lib/node';
+import type { BufferFormat } from '@e-mc/types/lib/request';
+
+interface ImportFrom {
+    placeholder: string;
+    original: string;
+    uri: string;
+    type?: string;
+    dynamic?: boolean;
+}
+
+interface DataObject extends CascadeAction {
+    format?: BufferFormat;
+    options?: PlainObject;
+}
+
+export interface UserAgentData {
+    platform: string;
+    brand: string;
+    browser: number;
+    version: Null<number[]>;
+}
+
+export interface DocumentOutput {
+    productionRelease?: boolean | string;
+    productionIncremental?: boolean;
+    useOriginalHtmlPage?: boolean | string;
+    useUnsafeReplace?: ArrayOf<"html" | "css"> | boolean;
+    useSessionCache?: boolean;
+    stripCommentsAndCDATA?: boolean | string;
+    normalizeHtmlOutput?: boolean | string;
+    escapeReservedCharacters?: boolean;
+    ignoreServerCodeBlocks?: string[];
+    webBundle?: {
+        rootDirAlias?: string;
+        baseUrl?: string;
+        primaryUrl?: string;
+        copyTo?: string;
+        rewriteHtmlPage?: boolean | string;
+        excludeHtmlPage?: boolean;
+        excludeTransforms?: boolean;
+        includeScopes?: string[];
+        excludeScopes?: string[];
+    };
+    templateMap?: TemplateMap;
+    userAgentData?: Partial<UserAgentData>;
+}
+
+export interface RequestData extends IRequestData<ChromeAsset>, Readonly<DocumentOutput>, Readonly<CssRuleData> {}
+
+export interface ChromeAsset extends FileAsset, AttributeAction, ElementAction, MetadataAction<PlainObject>, UploadAction, HashAction, ExcludeAction, ImportAction<ImportFrom[] | boolean>, FromAction {
+    preserve?: boolean;
+    static?: boolean;
+    editing?: boolean;
+    inlineContent?: string;
+    originAddress?: boolean;
+}
+
+export interface TemplateMap extends PlainObject {
+    html?: ObjectMap<StringMap>;
+    js?: ObjectMap<StringMap>;
+    css?: ObjectMap<StringMap>;
+    data?: StringMap;
+}
+
+export interface CssRuleData {
+    usedVariables?: string[];
+    usedFontFace?: string[];
+    usedKeyframes?: string[];
+    unusedStyles?: string[];
+    unusedMedia?: string[];
+    unusedContainer?: string[];
+    unusedSupports?: string[];
+    unusedAtRules?: UnusedAtRule[];
+}
+
+export interface UnusedAtRule {
+    selector?: string;
+    media?: ConditionProperty;
+    supports?: ConditionProperty;
+    container?: CssConditionData & Partial<ConditionProperty>;
+    layer?: string[];
+}
+
+export interface DataSource<T = string> extends IDataSource<T>, ElementAction {
+    source: "cloud" | "json" | "uri" | "local" | "export" | DbSource;
+    element?: XmlTagNode;
+    type?: "text" | "attribute" | "display";
+    dynamic?: boolean;
+    value?: StringOfArray | ObjectMap<unknown>;
+    template?: string;
+    viewEngine?: ViewEngine | string;
+    ignoreEmpty?: boolean;
+}
+
+export interface TextDataSource extends DataSource {
+    type: "text";
+    leadingText?: string;
+    trailingText?: string;
+}
+
+export interface UriDataSource extends DataSource, DataObject {
+    source: "uri";
+    body?: unknown;
+    contentType?: string;
+}
+
+export interface LocalDataSource extends DataSource, DataObject {
+    source: "local";
+    pathname?: string;
+}
+
+export interface JSONDataSource extends DataSource, CascadeAction {
+    source: "json";
+    items?: unknown;
+}
+
+export interface ExportDataSource extends DataSource, CascadeAction {
+    source: "export";
+    execute?: FunctionType;
+    pathname?: string;
+    settings?: string;
+    params?: unknown;
+    persist?: boolean;
 }