@pi-r/chrome 0.7.0 → 0.7.2

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,7 @@ 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_DATASET = {};
 const CACHE_ATRULES = {};
 let CACHE_TOTAL = 0;
@@ -180,9 +181,7 @@ function spliceSource(source, startIndex, endIndex, pattern, leading = '', trail
     if (leading || trailing) {
         content += getNewlineString(leading, trailing);
     }
-    if (pattern && content) {
-        pattern.lastIndex = startIndex + content.length;
-    }
+    pattern.lastIndex = startIndex + content.length;
     return spliceString(source, startIndex, endIndex, content);
 }
 function hasCondition(data, condition) {
@@ -900,6 +899,7 @@ 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 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);
+const isHtmlOnly = (assets, items, htmlFile) => !items.find(item => item !== htmlFile && assets.includes(item));
 class ChromeDocument extends Document {
     static INTERNAL_ASSIGNUUID = "__assign__";
     static INTERNAL_SERVERROOT = "__serverroot__";
@@ -933,33 +933,39 @@ class ChromeDocument extends Document {
             }
             CACHE_QUERY.clear();
             CACHE_SELECTOR.clear();
+            CACHE_ETAG.clear();
         }
         return result + (parent && result > 0 ? await super.purgeMemory(typeof parent === 'number' && parent > 0 ? parent : percent, limit, true) : 0);
     }
     static async finalize(instance) {
         if (instance.aborted) {
-            return Promise.reject((0, types_1.createAbortError)());
+            return (0, types_1.createAbortError)(true);
         }
-        const productionRelease = instance.productionRelease;
-        const processing = { host: this, startTime: process.hrtime(), hashed: new Set(), contentMap: {}, bufferMap: {}, cacheMiss: [], productionRelease: productionRelease ? true : undefined };
-        const { Db: db, htmlFile, assets } = instance;
-        const outHtml = htmlFile && !isIgnored(htmlFile, true);
-        if (db && await db.commit()) {
-            db.writeTimeElapsed('DB', ["Transactions were committed", db.moduleName], processing.startTime, { ...Document.LOG_STYLE_SUCCESS, type: 65536 });
+        const startTime = process.hrtime();
+        if (instance.Db && await instance.Db.commit()) {
+            instance.Db.writeTimeElapsed('DB', ["Transactions were committed", instance.Db.moduleName], startTime, { ...Document.LOG_STYLE_SUCCESS, type: 65536 });
         }
+        const productionRelease = !!instance.productionRelease;
+        const processing = { host: this, startTime, hashed: new Set(), contentMap: {}, bufferMap: {}, cacheMiss: [], productionRelease: productionRelease ? true : undefined };
+        const htmlFile = instance.htmlFile;
+        const outHtml = !!htmlFile && !isIgnored(htmlFile, true);
         if (instance.dataSource.length === 0 && outHtml) {
             const incremental = htmlFile.incremental ?? this.incremental;
             if (incremental === 'etag' || incremental === 'exists') {
                 const fetched = this.fetchedAssets;
-                const isHtmlOnly = () => !fetched.find(item => item !== htmlFile && assets.includes(item));
-                if (!productionRelease || instance.productionIncremental && (isHtmlOnly() || !fetched.find(item => item.hash))) {
+                if (!productionRelease || instance.productionIncremental && (isHtmlOnly(instance.assets, fetched, htmlFile) || !fetched.find(item => item.hash))) {
                     let hint = '';
                     switch (incremental) {
                         case 'etag': {
                             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 && (!(0, types_1.isArray)(item.from) || item.from.includes('style'))))) {
+                                    fetched.forEach(item => {
+                                        if (item.etag && item !== htmlFile && !item.invalid) {
+                                            CACHE_ETAG.set(item.localUri, item.etag);
+                                        }
+                                    });
                                     break;
                                 }
                                 try {
@@ -984,10 +990,10 @@ class ChromeDocument extends Document {
                                 instance.svgFiles = svg;
                                 await instance.applyTransforms(processing);
                             }
-                            hint = assets.filter(item => item.etag).length + ' assets';
+                            hint = instance.assets.filter(item => item.etag).length + ' assets';
                         }
                         case 'exists':
-                            if (hint || isHtmlOnly()) {
+                            if (hint || isHtmlOnly(instance.assets, fetched, htmlFile)) {
                                 this.formatMessage(4, 'HTML', ['No changes detected', 'incremental: ' + incremental], hint, { ...Document.LOG_STYLE_NOTICE, messageBgColor: 'bgWhite', messageColor: 'black' });
                                 return super.finalize.call(this, instance);
                             }
@@ -1000,7 +1006,7 @@ class ChromeDocument extends Document {
         if (instance.editing.length) {
             await instance.applyTransforms(processing);
             if (instance.aborted) {
-                return Promise.reject((0, types_1.createAbortError)());
+                return (0, types_1.createAbortError)(true);
             }
         }
         if (productionRelease) {
@@ -1013,7 +1019,7 @@ class ChromeDocument extends Document {
     }
     static async cleanup(instance) {
         if (instance.aborted) {
-            return Promise.reject((0, types_1.createAbortError)());
+            return (0, types_1.createAbortError)(true);
         }
         if (this.Watch) {
             const related = instance.related;
@@ -1316,7 +1322,7 @@ class ChromeDocument extends Document {
     }
     async using(data) {
         if (this.aborted) {
-            return Promise.reject((0, types_1.createAbortError)());
+            return (0, types_1.createAbortError)(true);
         }
         const file = data.file;
         if (file.editing) {
@@ -1737,7 +1743,7 @@ class ChromeDocument extends Document {
     }
     async cloudFinalize(state) {
         if (this.aborted) {
-            return Promise.reject((0, types_1.createAbortError)());
+            return (0, types_1.createAbortError)(true);
         }
         const { host, instance, localStorage } = state;
         const htmlFile = this.htmlFile;
@@ -1775,7 +1781,7 @@ class ChromeDocument extends Document {
                 }
             }
             if (this.aborted) {
-                return Promise.reject((0, types_1.createAbortError)());
+                return (0, types_1.createAbortError)(true);
             }
         }
         if (htmlFile) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/chrome",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "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.9.0",
-    "@e-mc/core": "^0.9.0",
-    "@e-mc/document": "^0.9.0",
-    "@e-mc/types": "^0.9.0"
+    "@e-mc/cloud": "^0.9.4",
+    "@e-mc/core": "^0.9.4",
+    "@e-mc/document": "^0.9.4",
+    "@e-mc/types": "^0.9.4"
   }
 }