@pi-r/chrome 0.8.3 → 0.9.0

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.
-
-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.
+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.
+
+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

@@ -4,4 +4,4 @@ https://e-mc.readthedocs.io/en/latest/document
 
 ### LICENSE
 
-MIT
+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

@@ -1,13 +1,13 @@
 "use strict";
-const path = require("path");
-const fs = require("fs");
-const crypto_1 = require("crypto");
-const core_1 = require("@e-mc/core");
+const path = require("node:path");
+const fs = require("node:fs");
+const node_crypto_1 = require("node:crypto");
 const Cloud = require("@e-mc/cloud");
+const core_1 = require("@e-mc/core");
+const dom_1 = require("@e-mc/document/parse/dom");
 const types_1 = require("@e-mc/types");
 const asset_1 = require("@e-mc/document/asset");
 const util_1 = require("@e-mc/document/util");
-const dom_1 = require("@e-mc/document/parse/dom");
 const transform_1 = require("@e-mc/document/transform");
 const Document = require('@e-mc/document');
 const CACHE_DBRESULT = new Map();
@@ -212,10 +212,12 @@ function hasCondition(data, condition) {
                 items.push([match[1], match[2], match[3]]);
             }
             REGEXP_TEMPLATECOMPARISON.lastIndex = 0;
-            if (items.length > 1 && !join) {
+            const length = items.length;
+            if (length > 1 && !join) {
                 return false;
             }
-            for (const item of items) {
+            for (let i = 0; i < length; ++i) {
+                const item = items[i];
                 const arg1 = item[1];
                 const arg2 = item[2];
                 let valid;
@@ -384,8 +386,8 @@ function getSrcURL(instance, parent, file) {
     if (parentDir === assetDir) {
         return [file.filename, true];
     }
-    const prefix = splitPath(parentDir);
-    const suffix = splitPath(assetDir);
+    const prefix = parentDir.split('/');
+    const suffix = assetDir.split('/');
     let found = false;
     while (prefix.length > 0 && suffix.length > 0 && prefix[0] === suffix[0]) {
         prefix.shift();
@@ -487,12 +489,12 @@ function transformURL(instance, host, parent, type, source, importFile) {
             if (asset) {
                 if (!asset.inlineBase64) {
                     if (host.Cloud?.getStorage('upload', asset.cloudStorage)) {
-                        const inlineUrlCloud = asset.inlineUrlCloud ||= (0, crypto_1.randomUUID)();
+                        const inlineUrlCloud = asset.inlineUrlCloud ||= (0, node_crypto_1.randomUUID)();
                         (parent.inlineUrlCloudMap ||= {})[inlineUrlCloud] = value;
                         value = inlineUrlCloud;
                     }
                     else if (asset.hash && instance.productionRelease) {
-                        const inlineUrl = asset.inlineUrl ||= (0, crypto_1.randomUUID)();
+                        const inlineUrl = asset.inlineUrl ||= (0, node_crypto_1.randomUUID)();
                         (parent.inlineUrlMap ||= {})[inlineUrl] = value;
                         value = inlineUrl;
                     }
@@ -633,12 +635,12 @@ function transformURL(instance, host, parent, type, source, importFile) {
                     }
                     else {
                         const pathname = parent.pathname;
-                        const count = pathname && pathname !== '/' && pathname !== '\\' ? pathname.split(/[\\/]/).length : 0;
+                        const count = pathname && pathname !== '/' ? pathname.split('/').length : 0;
                         fullUrl = (count ? '../'.repeat(count) : '') + asset.relativeUrl;
                     }
                 }
                 else if (!asset.invalid) {
-                    fullUrl = asset.inlineBase64 ||= (0, crypto_1.randomUUID)();
+                    fullUrl = asset.inlineBase64 ||= (0, node_crypto_1.randomUUID)();
                 }
                 if (url !== fullUrl) {
                     setOutputURL(fullUrl, asset);
@@ -667,7 +669,7 @@ function transformURL(instance, host, parent, type, source, importFile) {
 function getFormatUUID(instance, attr, ext) {
     const format = 'formatMap' in instance ? instance.formatMap : instance.module.format;
     let pattern;
-    return (0, types_1.isObject)(format) && (0, types_1.isObject)(pattern = ext && ext in format ? format[ext] : format.uuid) && pattern[attr] ? (0, types_1.randomString)(pattern[attr], pattern.dictionary) : (0, crypto_1.randomUUID)();
+    return (0, types_1.isObject)(format) && (0, types_1.isObject)(pattern = ext && ext in format ? format[ext] : format.uuid) && pattern[attr] ? (0, types_1.randomString)(pattern[attr], pattern.dictionary) : (0, node_crypto_1.randomUUID)();
 }
 function setLocationUUID(instance, data, file, ext) {
     const { pathname, filename } = data;
@@ -816,7 +818,7 @@ function replaceHtml(instance, source, { productionRelease, contentMap }, cssMap
 }
 function finalizeHtml(value, data) {
     for (const id in data) {
-        value = value.replace(new RegExp((0, types_1.escapePattern)(id), 'g'), data[id]);
+        value = value.replace(new RegExp(escapePattern(id), 'g'), data[id]);
     }
     return value;
 }
@@ -905,12 +907,14 @@ function errorCredential(instance, domBase, item, err) {
         instance.writeFail(["Invalid credentials", item.source], err);
     }
 }
+function escapePattern(value) {
+    return value.replace(/[-|\\{}()[\]^$+*?.]/g, capture => capture === '-' ? '\\x2d' : '\\' + capture);
+}
 const isSpace = dom_1.DomWriter.isSpace.bind(dom_1.DomWriter);
 const replaceMatch = dom_1.DomWriter.replaceMatch.bind(dom_1.DomWriter);
 const getNewlineString = dom_1.DomWriter.getNewlineString.bind(dom_1.DomWriter);
 const getBuffer = (item, localUri) => item.sourceUTF8 || item.buffer || ((localUri ||= item.localUri) && Document.isPath(localUri) ? fs.readFileSync(localUri, item.encoding) : null);
 const hasSourceMap = (metadata, value) => (0, types_1.isObject)(metadata) && metadata.__sourcemap__ === value;
-const splitPath = (value) => value.split(/[\\/]/).filter(segment => segment.trim());
 const isBundled = (value, main) => typeof value === 'number' && (value > 0 || main && value === 0);
 const isFont = (value) => value === 'truetype' || value === 'opentype' || value === 'woff' || value === 'woff2';
 const isImage = (value) => typeof value === 'string' && value.startsWith('image/') && value !== "image/svg+xml";
@@ -1130,8 +1134,8 @@ class ChromeDocument extends Document {
                         const serverRootMapping = instance.serverRootMapping;
                         const mapped = [];
                         for (const localDir in serverRootMapping) {
-                            const subDir = serverRootMapping[localDir];
-                            const destDir = validateDir(Document.normalizePath(/[\\/]$/.test(subDir) ? path.join(outputDir, subDir, localDir) : path.join(outputDir, subDir), true));
+                            const subDir = path.normalize(serverRootMapping[localDir]);
+                            const destDir = validateDir(Document.normalizePath(subDir.endsWith(path.sep) ? path.join(outputDir, subDir, localDir) : path.join(outputDir, subDir), true));
                             if (destDir.startsWith(outputDir)) {
                                 if (this.canWrite(destDir)) {
                                     mapped.push([Document.normalizePath(localDir, true), destDir, 0]);
@@ -1847,7 +1851,7 @@ class ChromeDocument extends Document {
         }
     }
     removeServerRoot(value) {
-        return value.replace(new RegExp('(\\.\\./)*' + (0, types_1.escapePattern)(ChromeDocument.INTERNAL_SERVERROOT), 'g'), '');
+        return value.replace(new RegExp('(\\.\\./)*' + escapePattern(ChromeDocument.INTERNAL_SERVERROOT), 'g'), '');
     }
     addCopy(data, saveAs) {
         if (data.command && this.host) {
@@ -1876,7 +1880,7 @@ class ChromeDocument extends Document {
         if (this.htmlFile) {
             const endpoint = instance.getStorage('upload', this.htmlFile.cloudStorage)?.upload?.endpoint;
             if (endpoint) {
-                this._cloudEndpoint = new RegExp((0, types_1.escapePattern)(Document.toPosix(endpoint)) + '/', 'g');
+                this._cloudEndpoint = new RegExp(escapePattern(Document.toPosix(endpoint)) + '/', 'g');
             }
         }
     }
@@ -1893,7 +1897,7 @@ class ChromeDocument extends Document {
             const cloudUrl = endpoint ? url.replace(endpoint, '') : url;
             file.cloudUrl = cloudUrl;
             if (inlineUrlCloud) {
-                const pattern = new RegExp((0, types_1.escapePattern)(inlineUrlCloud), 'g');
+                const pattern = new RegExp(escapePattern(inlineUrlCloud), 'g');
                 for (const item of this.editing) {
                     if (item.inlineUrlCloudMap?.[inlineUrlCloud]) {
                         const source = host.getUTF8String(item);
@@ -1923,7 +1927,7 @@ class ChromeDocument extends Document {
                 for (const id in this._cloudUrlMap) {
                     const inlineUrlCloud = item.inlineUrlCloudMap[id];
                     if (inlineUrlCloud && !this._cloudUploaded.has(id)) {
-                        output = (output || source).replace(new RegExp((0, types_1.escapePattern)(id), 'g'), inlineUrlCloud);
+                        output = (output || source).replace(new RegExp(escapePattern(id), 'g'), inlineUrlCloud);
                         state.localStorage.delete(this._cloudUrlMap[id]);
                     }
                 }
@@ -1999,7 +2003,7 @@ class ChromeDocument extends Document {
             const inlineUrlCloudMap = main.inlineUrlCloudMap || {};
             const using = [];
             let found = false;
-            for (let i = 0, length = assets.length, current, upload; i < length; ++i) {
+            for (let i = 0, length = assets.length, current; i < length; ++i) {
                 const asset = assets[i];
                 if (asset.element && isUnedited(asset)) {
                     continue;
@@ -2011,7 +2015,7 @@ class ChromeDocument extends Document {
                 else if (isWatched(this, asset) ||
                     (0, types_1.watchFlag)(asset.flags) ||
                     asset.base64 && watch.related.find(item => (0, asset_1.isEqual)(item, asset)) ||
-                    (0, types_1.isArray)(asset.cloudStorage) && asset.cloudStorage.some(item => (upload = item.upload) && upload.active)) {
+                    (0, types_1.isArray)(asset.cloudStorage) && asset.cloudStorage.some(item => item.upload?.active)) {
                     using.push(asset);
                 }
                 else if (current = watch.assets.find(item => (0, asset_1.isEqual)(item, asset))) {
@@ -2104,8 +2108,8 @@ class ChromeDocument extends Document {
                         let current = srcset, match;
                         for (const url of items) {
                             const resolve = sameOrigin && !Document.isURL(url);
-                            const pathname = url.split(/[\\/]/).map(seg => (0, types_1.escapePattern)(seg)).join('[\\\\/]');
-                            const pattern = new RegExp(`(,?\\s*)(${(resolve && !url.startsWith('.') ? `(?:\\.\\.[\\\\/])*\\.\\.${pathname}|` : '') + pathname})(` + (!url.includes('?') ? '(?:(?!,)(?:[^?]|$)[^,]*)|(?!\\?)[^,]*)' : '[^,]*)'), 'g');
+                            const pathname = url.split('/').map(seg => escapePattern(seg)).join('/');
+                            const pattern = new RegExp(`(,?\\s*)(${(resolve && !url.startsWith('.') ? `(?:\\.\\./)*\\.\\.${pathname}|` : '') + pathname})(` + (!url.includes('?') ? '(?:(?!,)(?:[^?]|$)[^,]*)|(?!\\?)[^,]*)' : '[^,]*)'), 'g');
                             while (match = pattern.exec(current)) {
                                 const partial = match[2];
                                 if (!resolve || baseHref.some(baseUri => uri === Document.resolvePath(partial, baseUri))) {
@@ -2146,7 +2150,7 @@ class ChromeDocument extends Document {
                 readBase64(item, item.inlineBase64);
             }
             else if (!item.invalid && (0, util_1.hasValue)(item.format, 'base64')) {
-                const uuid = (0, crypto_1.randomUUID)();
+                const uuid = (0, node_crypto_1.randomUUID)();
                 if (readBase64(item, uuid)) {
                     item.inlineBase64 = uuid;
                 }
@@ -2352,7 +2356,7 @@ class ChromeDocument extends Document {
         source = removeNamespace(moduleName, domBase.modified ? domBase.close() : source, domBase.newline, domBase.getComments());
         if (this.sanitizeFramework) {
             for (const name of this.sanitizeFramework) {
-                source = source.replace(name === '*' ? REGEXP_SANITIZEALL : new RegExp(`(?:\\s+|\\b)data-(?:${(0, types_1.escapePattern)(name)}-[^=\\s]+|.+?-${(0, types_1.escapePattern)(name)})\\s*${dom_1.DomWriter.PATTERN_ATTRVALUE}(?=(?:[^"<]+"[^"]*"|[^'<]+'[^']*')*[^<>]*>)`, 'g'), '');
+                source = source.replace(name === '*' ? REGEXP_SANITIZEALL : new RegExp(`(?:\\s+|\\b)data-(?:${escapePattern(name)}-[^=\\s]+|.+?-${escapePattern(name)})\\s*${dom_1.DomWriter.PATTERN_ATTRVALUE}(?=(?:[^"<]+"[^"]*"|[^'<]+'[^']*')*[^<>]*>)`, 'g'), '');
             }
         }
         if (!htmlFile.preserve) {
@@ -2444,7 +2448,7 @@ class ChromeDocument extends Document {
                 }
                 if (uri && !(0, util_1.hasValue)(item.format, 'crossorigin') && item !== this.htmlFile) {
                     if (host.Cloud?.getStorage('upload', item.cloudStorage)) {
-                        const inlineUrlCloud = item.inlineUrlCloud ||= (0, crypto_1.randomUUID)();
+                        const inlineUrlCloud = item.inlineUrlCloud ||= (0, node_crypto_1.randomUUID)();
                         (this.htmlFile.inlineUrlCloudMap ||= {})[inlineUrlCloud] = productionRelease ? this.removeServerRoot(uri) : uri;
                         uri = inlineUrlCloud;
                     }
@@ -2534,7 +2538,7 @@ class ChromeDocument extends Document {
         if (this.dataSource.length === 0) {
             return;
         }
-        const sessionKey = (0, crypto_1.randomUUID)();
+        const sessionKey = (0, node_crypto_1.randomUUID)();
         const cacheData = Object.create(null);
         const dataItems = [];
         const displayItems = [];
@@ -2847,14 +2851,14 @@ class ChromeDocument extends Document {
                                         }
                                     }
                                     if (!getData) {
-                                        const { settings, encoding, persist = true } = current;
+                                        const { settings, encoding } = current;
                                         target ||= settings && this.settings.export?.[settings] || pathname;
                                         if (typeof target === 'function') {
                                             getData = target;
                                             hint = target.name;
                                         }
                                         else if ((0, types_1.isString)(target)) {
-                                            getData = this.asSourceFile(target, { encoding, persist });
+                                            getData = this.asSourceFile(target, { encoding });
                                             hint = target;
                                         }
                                     }
@@ -3473,7 +3477,7 @@ class ChromeDocument extends Document {
         const parseSelector = (value) => {
             const items = [];
             const revised = value.replace(useUnsafeCssReplace ? REGEXP_NTHCHILD_UNSAFE : REGEXP_NTHCHILD, (...capture) => {
-                return '`%' + (items.push('\\(' + stringSome + (capture[1] === '-' ? '\\x2d' : '\\x2b?') + (capture[2] || '[01]?') + (capture[3] === '0' ? !capture[1] && !capture[2] && !capture[4] && !capture[5] ? '[+-]?0[nN]?' : '0' : '[nN]') + stringSome + (capture[5] ? (capture[4] === '-' ? '\\x2d' : '\\x2b') + stringSome + capture[5] : `(?:[+-]${stringSome}0)?`) + (capture[6] ? stringMany + '[oO][fF]' + stringMany + capture[6].trim() : '') + stringSome + '\\)') - 1) + '`';
+                return '`%' + (items.push('\\(' + stringSome + (capture[1] === '-' ? '\\x2d' : '\\x2b?') + (capture[2] || '[01]?') + (capture[3] === '0' ? !capture[1] && !capture[2] && !capture[4] && !capture[5] ? '[+-]?0[nN]?' : '0' : '[nN]?') + stringSome + (capture[5] ? (capture[4] === '-' ? '\\x2d' : '\\x2b?') + stringSome + capture[5] : `(?:[+-]${stringSome}0)?`) + (capture[6] ? stringMany + '[oO][fF]' + stringMany + capture[6].trim() : '') + stringSome + '\\)') - 1) + '`';
             });
             let selector = '';
             for (let i = 0, length = revised.length, casing = false, attr = false, quote = false; i < length; i++) {
@@ -3548,7 +3552,7 @@ class ChromeDocument extends Document {
                 }
                 selector += (space & 1 ? '`%%`' : '') + (!casing && ch >= 'a' && ch <= 'z' ? '`' + ch + ch.toUpperCase() + '`' : ch) + (space & 2 ? '`%%`' : '');
             }
-            selector = (0, types_1.escapePattern)(selector)
+            selector = escapePattern(selector)
                 .replace(/\s*(>|~(?!=)|\\\+|\\\*(?!=)])\s*/g, (...capture) => stringSome + capture[1] + stringSome)
                 .replace(/`([a-z][A-Z]|%{2,4})`/g, (...capture) => {
                 switch (capture[1]) {
@@ -3614,7 +3618,7 @@ class ChromeDocument extends Document {
                         }
                     }
                     if (!revised) {
-                        selector = (0, types_1.escapePattern)(selector || value)
+                        selector = escapePattern(selector || value)
                             .replace(/\s*(\\[()])\s*/g, (...capture) => stringSome + capture[1] + stringSome)
                             .replace(/:\s+/g, stringSome + ':' + stringSome)
                             .replace(/\s+([<>/]|<=|>=|\\\*)\s+/g, (...capture) => stringSome + capture[1] + stringSome)
@@ -3631,7 +3635,7 @@ class ChromeDocument extends Document {
                 }
                 while (rule = pattern.exec(current)) {
                     if (!nesting) {
-                        const block = Array.from(current.substring(0, rule.index).matchAll(/{|}/g));
+                        const block = Array.from(current.substring(0, rule.index).matchAll(/[{}]/g));
                         if (block.filter(open => open[0] === '{').length !== block.filter(close => close[0] === '}').length) {
                             continue;
                         }
@@ -3651,7 +3655,7 @@ class ChromeDocument extends Document {
                 while (bracket = pattern.exec(current)) {
                     const segment = bracket[0];
                     if (/[{}]/.test(segment)) {
-                        const placeholder = '`' + (0, crypto_1.randomUUID)() + '`';
+                        const placeholder = '`' + (0, node_crypto_1.randomUUID)() + '`';
                         replaceMap.push([placeholder, segment]);
                         current = replaceMatch(bracket, current, placeholder, pattern);
                     }
@@ -3664,7 +3668,7 @@ class ChromeDocument extends Document {
             for (let i = 0, length = values.length; i < length; ++i) {
                 const seg = values[i];
                 if (/^url\([^{}]*[{}].*\)$/is.test(seg)) {
-                    replaceMap.push([values[i] = (0, crypto_1.randomUUID)(), seg]);
+                    replaceMap.push([values[i] = (0, node_crypto_1.randomUUID)(), seg]);
                 }
             }
             if (replaceMap.length > 0) {
@@ -3783,7 +3787,7 @@ class ChromeDocument extends Document {
                     modified = true;
                     return output + target.substring(index);
                 }
-                return !child ? target : '';
+                return child ? '' : target;
             })(current, false);
         }
         if (usedVariables) {
@@ -3849,9 +3853,8 @@ class ChromeDocument extends Document {
         }
     }
     get elements() {
-        const result = this._elements;
-        if (result) {
-            return result;
+        if (this._elements) {
+            return this._elements;
         }
         const elements = new Set();
         const host = this.host;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/chrome",
-  "version": "0.8.3",
+  "version": "0.9.0",
   "description": "Chrome document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -14,16 +14,15 @@
   },
   "keywords": [
     "squared",
-    "e-mc",
-    "squared-functions"
+    "e-mc"
   ],
   "author": "An Pham <anpham6@gmail.com>",
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.10.3",
-    "@e-mc/core": "^0.10.3",
-    "@e-mc/document": "^0.10.3",
-    "@e-mc/types": "^0.10.3"
+    "@e-mc/cloud": "^0.11.0",
+    "@e-mc/core": "^0.11.0",
+    "@e-mc/document": "^0.11.0",
+    "@e-mc/types": "^0.11.0"
   }
 }

package/types/index.d.ts

@@ -63,7 +63,7 @@ export interface FinalizeProcessing<T extends IFileManager<U>, U extends Documen
     readonly contentMap: StringMap;
     readonly bufferMap: ObjectMap<Bufferable>;
     readonly cacheMiss: string[];
-    readonly productionRelease: Undef<true>;
+    readonly productionRelease: true | undefined;
 }
 
 export interface DocumentComponent<T = boolean> extends IDocumentComponent<T, T>, DocumentComponentExtended<T> {}
@@ -92,7 +92,7 @@ export interface UserConfig extends CssRuleData, Omit<DocumentOutput, OutputType
 }
 
 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>;
+    htmlFile: U | null;
     cssFiles: U[];
     jsFiles: U[];
     svgFiles: U[];
@@ -103,16 +103,16 @@ export interface IChromeDocument<T extends IFileManager<U>, U extends DocumentAs
     replaced: U[];
     formatMap?: ObjectMap<FormatUri>;
     setElementSrc(asset: U, element: IXmlElement, value: string): void;
-    findDataValue(name: string): Undef<string>;
+    findDataValue(name: string): string | undefined;
     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>;
+    removeUnusedStyles(source: string, options?: UserConfig): string | undefined;
     removeServerRoot(value: string): string;
-    replaceContent(source: string, match: RegExpExecArray | string, mimeType?: string): Undef<string>;
+    replaceContent(source: string, match: RegExpExecArray | string, mimeType?: string): string | undefined;
     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>;

package/types/squared.d.ts

@@ -19,8 +19,8 @@ interface DataObject extends CascadeAction {
 }
 
 interface ScopeData {
-    start: Null<string>;
-    end: Null<string>;
+    start: string | null;
+    end: string | null;
 }
 
 interface ConditionProperty {
@@ -36,7 +36,7 @@ export interface UserAgentData {
     name: string;
     brand: string;
     browser: number;
-    version: Null<number[]>;
+    version: number[] | null;
     majorVersion: number;
     mobile: boolean;
 }
@@ -53,17 +53,7 @@ export interface DocumentOutput {
     escapeReservedCharacters?: boolean;
     ignoreServerCodeBlocks?: string[];
     sanitizeFramework?: string[];
-    webBundle?: {
-        rootDirAlias?: string;
-        baseUrl?: string;
-        primaryUrl?: string;
-        copyTo?: string;
-        rewriteHtmlPage?: boolean | string;
-        excludeHtmlPage?: boolean;
-        excludeTransforms?: boolean;
-        includeScopes?: string[];
-        excludeScopes?: string[];
-    };
+    webBundle?: unknown;
     templateMap?: TemplateMap;
     userAgentData?: Partial<UserAgentData>;
 }
@@ -109,7 +99,7 @@ export interface DataSource<T = string> extends IDataSource<T>, ElementAction {
     source: "cloud" | "json" | "uri" | "local" | "export" | DbSource;
     type?: "text" | "attribute" | "display";
     dynamic?: boolean;
-    value?: ArrayOf<string> | AnyObject;
+    value?: string | string[] | AnyObject;
     template?: string;
     viewEngine?: ViewEngine | string;
     ignoreEmpty?: boolean;
@@ -144,5 +134,4 @@ export interface ExportDataSource extends DataSource, CascadeAction {
     pathname?: string;
     settings?: string;
     params?: unknown;
-    persist?: boolean;
 }