@pi-r/chrome 0.3.3 → 0.3.5

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Lisa Mishima
+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:
 

package/index.js

@@ -11,6 +11,9 @@ const transform_1 = require("@e-mc/document/transform");
 const Document = require('@e-mc/document');
 const CACHE_DBRESULT = new Map();
 const CACHE_LOCALFILE = 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;
@@ -286,7 +289,7 @@ function hasSameOrigin(value, ...other) {
     return false;
 }
 function restoreSearchParams(value, prefix = '__sqd') {
-    if (value?.indexOf(prefix) !== -1) {
+    if ((value === null || value === void 0 ? void 0 : value.indexOf(prefix)) !== -1) {
         const params = new URLSearchParams(value);
         params.forEach((_, key) => key.startsWith(prefix) && params.delete(key));
         if (value = params.toString()) {
@@ -378,6 +381,7 @@ function getSrcURL(parent, file) {
     return [found ? joinPath('../'.repeat(prefix.length), suffix.join('/'), file.filename) : '../'.repeat(prefix.length) + relativeUrl];
 }
 function transformURL(host, parent, type, source, importFile) {
+    var _a;
     const related = [];
     const baseHref = getBaseURLs(importFile || parent, this.baseUrl);
     const isHtml = type === 'html';
@@ -443,12 +447,13 @@ function transformURL(host, parent, type, source, importFile) {
             }
         }
         const setOutputURL = (value, asset) => {
+            var _a;
             if (!value) {
                 return;
             }
             if (asset) {
                 if (!asset.inlineBase64) {
-                    if (host.Cloud?.getStorage('upload', asset.cloudStorage)) {
+                    if ((_a = host.Cloud) === null || _a === void 0 ? void 0 : _a.getStorage('upload', asset.cloudStorage)) {
                         const inlineUrlCloud = asset.inlineUrlCloud || (asset.inlineUrlCloud = (0, types_1.generateUUID)());
                         (parent.inlineUrlCloudMap || (parent.inlineUrlCloudMap = {}))[inlineUrlCloud] = value;
                         value = inlineUrlCloud;
@@ -529,7 +534,7 @@ function transformURL(host, parent, type, source, importFile) {
             url = trimQuote(content);
         }
         if (url.startsWith('data:')) {
-            const base64 = url.split(',')[1]?.trim();
+            const base64 = (_a = url.split(',')[1]) === null || _a === void 0 ? void 0 : _a.trim();
             if (base64) {
                 for (const item of this.assets) {
                     if (item.base64 === base64) {
@@ -748,7 +753,7 @@ function transformJs(host, file, output) {
                 this.writeFail(["Unable to write file", path.basename(chunkUri)], err, 32);
             }
         }
-        appending?.forEach(item => item.order += order);
+        appending === null || appending === void 0 ? void 0 : appending.forEach(item => item.order += order);
     }
     if ((0, types_1.isArray)(sourceFiles)) {
         file.sourceFiles = sourceFiles;
@@ -867,7 +872,7 @@ const isIgnored = (item, exists) => item.invalid || (0, types_1.ignoreFlag)(item
 const findFont = (value) => value && (Array.isArray(value) ? value : [value]).find(format => isFont(format));
 const spliceString = (source, startIndex, endIndex, content) => source.substring(0, startIndex) + content + source.substring(endIndex);
 const getEndIndex = (match) => match.index + match[0].length;
-const getRelativeURL = (file) => joinPath(file.moveTo, file.pathname, file.inlineFilename || file.filename) + (!file.static ? restoreSearchParams(file.url?.search) : '');
+const getRelativeURL = (file) => { var _a; return joinPath(file.moveTo, file.pathname, file.inlineFilename || file.filename) + (!file.static ? restoreSearchParams((_a = file.url) === null || _a === void 0 ? void 0 : _a.search) : ''); };
 const errorHtml = ({ tagName, tagIndex = -1 }) => (0, types_1.errorMessage)('html', 'Location did not resolve', tagName.toLowerCase() + (tagIndex >= 0 ? ': ' + tagIndex : ''));
 const errorDataSource = (value, hint) => (0, types_1.errorMessage)('data-source', value, hint);
 class ChromeDocument extends Document {
@@ -937,10 +942,14 @@ class ChromeDocument extends Document {
                 }
                 CACHE_TOTAL = stored.length - result;
             }
+            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);
     }
     static async finalize(instance) {
+        var _a;
         if (instance.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
@@ -952,7 +961,7 @@ class ChromeDocument extends Document {
             db.writeTimeElapsed('DB', ["Transactions were committed", db.moduleName], processing.startTime, { ...Document.LOG_STYLE_SUCCESS, type: 65536 });
         }
         if (instance.dataSource.length === 0 && outHtml) {
-            const incremental = htmlFile.incremental ?? this.incremental;
+            const incremental = (_a = htmlFile.incremental) !== null && _a !== void 0 ? _a : this.incremental;
             if (incremental === 'etag' || incremental === 'exists') {
                 const fetched = this.fetchedAssets;
                 const isHtmlOnly = () => !fetched.find(item => item !== htmlFile && assets.includes(item));
@@ -963,12 +972,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;
                                 }
@@ -976,12 +1000,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;
@@ -1550,6 +1601,7 @@ class ChromeDocument extends Document {
     }
     resolveImports(file, code, baseFile) {
         var _a;
+        var _b;
         if (!Array.isArray(file.imports)) {
             return;
         }
@@ -1565,7 +1617,7 @@ class ChromeDocument extends Document {
         }
         const importMap = {};
         for (const item of file.imports) {
-            (importMap[_a = item.placeholder] || (importMap[_a] = [])).push(item);
+            (importMap[_b = item.placeholder] || (importMap[_b] = [])).push(item);
         }
         for (const placeholder in importMap) {
             const items = importMap[placeholder];
@@ -1575,7 +1627,7 @@ class ChromeDocument extends Document {
                     const { uri, original, type, dynamic } = items[i];
                     let value;
                     if (type === 'css') {
-                        const asset = this.host?.findAsset(uri);
+                        const asset = (_a = this.host) === null || _a === void 0 ? void 0 : _a.findAsset(uri);
                         if (asset) {
                             const [relativeUrl, sameDir] = getSrcURL.call(this, bundleMain || file, asset);
                             if (relativeUrl) {
@@ -1603,12 +1655,13 @@ class ChromeDocument extends Document {
         }
     }
     replaceContent(source, statement, mimeType) {
+        var _a;
         switch (mimeType) {
             case 'text/css': {
                 const match = REGEXP_REPLACECSS.exec((typeof statement === 'string' ? statement : statement[0]).trim());
                 if (match) {
                     const layer = match[1];
-                    const supports = match[3]?.trim();
+                    const supports = (_a = match[3]) === null || _a === void 0 ? void 0 : _a.trim();
                     const query = match[4].trim();
                     if (layer || supports || query) {
                         const newline = (0, util_1.getNewline)(source);
@@ -1645,8 +1698,9 @@ class ChromeDocument extends Document {
         }
     }
     writeImage(data) {
+        var _a;
         const { file, output, command } = data;
-        if (output && command && file.element?.outerXml) {
+        if (output && command && ((_a = file.element) === null || _a === void 0 ? void 0 : _a.outerXml)) {
             const match = REGEXP_SRCSETSIZE.exec(command);
             if (match) {
                 (file.srcSet || (file.srcSet = [])).push(toPosix(data.baseDirectory ? output.substring(data.baseDirectory.length + 1) : output), match[1] + match[2].toLowerCase());
@@ -1657,12 +1711,13 @@ class ChromeDocument extends Document {
         return false;
     }
     cloudInit({ instance }) {
+        var _a, _b;
         this._cloudUrlMap = Object.create(null);
         this._cloudUploaded = new Set();
         this._cloudEndpoint = null;
         const htmlFile = this.htmlFile;
         if (htmlFile) {
-            const endpoint = instance.getStorage('upload', htmlFile.cloudStorage)?.upload?.endpoint;
+            const endpoint = (_b = (_a = instance.getStorage('upload', htmlFile.cloudStorage)) === null || _a === void 0 ? void 0 : _a.upload) === null || _b === void 0 ? void 0 : _b.endpoint;
             if (endpoint) {
                 this._cloudEndpoint = new RegExp((0, types_1.escapePattern)(toPosix(endpoint)) + '/', 'g');
             }
@@ -1675,6 +1730,7 @@ class ChromeDocument extends Document {
         return this.editing.includes(file);
     }
     cloudUpload({ host }, file, url, active) {
+        var _a;
         if (active) {
             const endpoint = this._cloudEndpoint;
             const inlineUrlCloud = file.inlineUrlCloud;
@@ -1684,7 +1740,7 @@ class ChromeDocument extends Document {
                 const htmlFile = this.htmlFile;
                 const pattern = new RegExp((0, types_1.escapePattern)(inlineUrlCloud), 'g');
                 for (const item of this.editing) {
-                    if (item.inlineUrlCloudMap?.[inlineUrlCloud]) {
+                    if ((_a = item.inlineUrlCloudMap) === null || _a === void 0 ? void 0 : _a[inlineUrlCloud]) {
                         const source = host.getUTF8String(item);
                         const output = source.replace(pattern, endpoint && item !== htmlFile && cloudUrl.indexOf('/') !== -1 ? url : cloudUrl);
                         if (source !== output) {
@@ -1699,6 +1755,7 @@ class ChromeDocument extends Document {
         return Promise.resolve(false);
     }
     async cloudFinalize(state) {
+        var _a;
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
@@ -1747,7 +1804,7 @@ class ChromeDocument extends Document {
                 for (const storage of cloudStorage) {
                     if (instance.hasCredential('storage', storage)) {
                         const { service, admin, bucket, upload } = storage;
-                        const website = admin?.configBucket?.website;
+                        const website = (_a = admin === null || admin === void 0 ? void 0 : admin.configBucket) === null || _a === void 0 ? void 0 : _a.website;
                         if ((0, types_1.isPlainObject)(website) && bucket && upload) {
                             let filename = joinPath(upload.pathname, upload.filename || path.basename(htmlFile.localUri));
                             if (website.indexPage === true) {
@@ -1783,7 +1840,7 @@ class ChromeDocument extends Document {
         }
         const main = watch.main;
         let result;
-        if (main?.editing && main.mimeType === 'text/html') {
+        if ((main === null || main === void 0 ? void 0 : main.editing) && main.mimeType === 'text/html') {
             const inlineUrlCloudMap = main.inlineUrlCloudMap || {};
             const using = [];
             let found;
@@ -1820,6 +1877,7 @@ class ChromeDocument extends Document {
     }
     watchModified(watch, assets) {
         return (files, errors, status) => {
+            var _a;
             if (!watch.server || watch.captured || watch.aborted) {
                 return;
             }
@@ -1839,7 +1897,7 @@ class ChromeDocument extends Document {
                     search = next.url.search;
                 }
             }
-            search ?? (search = restoreSearchParams(asset.url?.search));
+            search !== null && search !== void 0 ? search : (search = restoreSearchParams((_a = asset.url) === null || _a === void 0 ? void 0 : _a.search));
             status && (status = status.filter(item => item.type >= types_1.STATUS_TYPE.FATAL && item.type <= types_1.STATUS_TYPE.WARN));
             watch.send(types_1.WATCH_EVENT.MODIFIED, {
                 action: pathname && watch.hot && !watch.main ? 'hot' : '',
@@ -1911,11 +1969,13 @@ class ChromeDocument extends Document {
         }
     }
     findDataValue(name) {
+        var _a;
         if (this.hasEval('template')) {
-            return this.templateMap.data?.[name];
+            return (_a = this.templateMap.data) === null || _a === void 0 ? void 0 : _a[name];
         }
     }
     setInlinedAttributes({ host, startTime, hashed, contentMap, bufferMap, productionRelease }) {
+        var _a, _b;
         const readBase64 = (item, uuid) => {
             if (!contentMap[uuid]) {
                 try {
@@ -1945,7 +2005,7 @@ class ChromeDocument extends Document {
                     const filename = createHash(host, item, bufferMap);
                     if (filename) {
                         for (const hash of this.assets) {
-                            const url = inlineUrl ? hash.inlineUrlMap?.[inlineUrl] : hash.inlineUrlCloudMap?.[inlineUrlCloud];
+                            const url = inlineUrl ? (_a = hash.inlineUrlMap) === null || _a === void 0 ? void 0 : _a[inlineUrl] : (_b = hash.inlineUrlCloudMap) === null || _b === void 0 ? void 0 : _b[inlineUrlCloud];
                             if (url) {
                                 const search = url.indexOf('?');
                                 const index = (search !== -1 ? url.substring(0, search) : url).lastIndexOf('/');
@@ -1993,10 +2053,10 @@ class ChromeDocument extends Document {
             const sortNested = (a, b) => {
                 const { inlineUrlCloud: urlA, inlineUrlCloudMap: mapA } = a;
                 const { inlineUrlCloud: urlB, inlineUrlCloudMap: mapB } = b;
-                if (urlA && mapB?.[urlA]) {
+                if (urlA && (mapB === null || mapB === void 0 ? void 0 : mapB[urlA])) {
                     return -1;
                 }
-                if (urlB && mapA?.[urlB]) {
+                if (urlB && (mapA === null || mapA === void 0 ? void 0 : mapA[urlB])) {
                     return 1;
                 }
                 return 0;
@@ -2226,7 +2286,7 @@ class ChromeDocument extends Document {
                     }
                 }
                 if (uri && !(0, util_1.hasValue)(item.format, 'crossorigin') && item !== htmlFile) {
-                    if (cloud?.getStorage('upload', item.cloudStorage)) {
+                    if (cloud === null || cloud === void 0 ? void 0 : cloud.getStorage('upload', item.cloudStorage)) {
                         const inlineUrlCloud = item.inlineUrlCloud || (item.inlineUrlCloud = (0, types_1.generateUUID)());
                         ((_a = htmlFile).inlineUrlCloudMap || (_a.inlineUrlCloudMap = {}))[inlineUrlCloud] = productionRelease ? this.removeServerRoot(uri) : uri;
                         uri = inlineUrlCloud;
@@ -2394,7 +2454,7 @@ class ChromeDocument extends Document {
                         batchGroup.push([item]);
                         break;
                     default:
-                        if (db?.hasSource(type)) {
+                        if (db === null || db === void 0 ? void 0 : db.hasSource(type)) {
                             try {
                                 await db.setCredential(item);
                                 const credential = item.credential;
@@ -2427,6 +2487,7 @@ class ChromeDocument extends Document {
             }
             return this.allSettled(batchGroup.map(batch => {
                 return new Promise(async (resolve, reject) => {
+                    var _a, _b, _c;
                     const errorRemove = (item, reason) => {
                         removeElement(item);
                         reject(reason);
@@ -2485,7 +2546,7 @@ class ChromeDocument extends Document {
                                 }
                                 else {
                                     this.abort(type);
-                                    errorRemove(current, target ? errorDataSource('Not found', target) : errorDataSource('Not defined - ' + (this.settings.directory?.data ? 'file' : 'directory'), type));
+                                    errorRemove(current, target ? errorDataSource('Not found', target) : errorDataSource('Not defined - ' + (((_a = this.settings.directory) === null || _a === void 0 ? void 0 : _a.data) ? 'file' : 'directory'), type));
                                     return;
                                 }
                             }
@@ -2614,7 +2675,7 @@ class ChromeDocument extends Document {
                                     if (!getData) {
                                         const { settings, encoding, persist = true } = current;
                                         if (!target) {
-                                            target = settings && this.settings.export?.[settings] || pathname;
+                                            target = settings && ((_b = this.settings.export) === null || _b === void 0 ? void 0 : _b[settings]) || pathname;
                                         }
                                         if (typeof target === 'function') {
                                             getData = target;
@@ -2674,7 +2735,7 @@ class ChromeDocument extends Document {
                             break;
                         }
                         default:
-                            if (db?.hasSource(type)) {
+                            if (db === null || db === void 0 ? void 0 : db.hasSource(type)) {
                                 switch (type) {
                                     case 'mongodb':
                                         for (let j = 0; j < length; ++j) {
@@ -2898,7 +2959,7 @@ class ChromeDocument extends Document {
                                                 for (let j = 0, match; j < items.length; ++j) {
                                                     const row = items[j];
                                                     if ((0, types_1.isPlainObject)(row)) {
-                                                        row.__index__ ?? (row.__index__ = j + 1);
+                                                        (_c = row.__index__) !== null && _c !== void 0 ? _c : (row.__index__ = j + 1);
                                                     }
                                                     let segment = template;
                                                     while (match = REGEXP_TEMPLATECONDITIONAL.exec(segment)) {
@@ -3181,6 +3242,7 @@ class ChromeDocument extends Document {
         }
     }
     setProductionAttributes({ host, hashed, bufferMap, startTime }) {
+        var _a;
         for (const item of this.assets) {
             if (isIgnored(item, true)) {
                 continue;
@@ -3188,7 +3250,7 @@ class ChromeDocument extends Document {
             if (!hashed.has(item)) {
                 createHash(host, item, bufferMap);
             }
-            switch (item.element?.tagName.toLowerCase()) {
+            switch ((_a = item.element) === null || _a === void 0 ? void 0 : _a.tagName.toLowerCase()) {
                 case 'style':
                     if (!item.content) {
                         break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/chrome",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Chrome document constructor for E-mc.",
   "main": "index.js",
   "publishConfig": {
@@ -20,9 +20,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.6.2",
-    "@e-mc/core": "^0.6.2",
-    "@e-mc/document": "^0.6.2",
-    "@e-mc/types": "^0.6.2"
+    "@e-mc/cloud": "^0.6.7",
+    "@e-mc/core": "^0.6.7",
+    "@e-mc/document": "^0.6.7",
+    "@e-mc/types": "^0.6.7"
   }
 }