@e-mc/document 0.7.23 → 0.7.25

package/index.js

@@ -18,7 +18,6 @@ const CACHE_CODE = {};
 const CACHE_HASH = {};
 const CACHE_TEMPLATE = {};
 const CACHE_VIEWENGINE = new Map();
-const CACHE_EXTERNAL = {};
 const CACHE_PICOMATCH = new Map();
 let CACHE_TOTAL = 0;
 function renewTransform(map, key, expires) {
@@ -60,7 +59,7 @@ class Document extends core_1.Client {
                     delete cache[name];
                 }
             }
-            for (const cache of [CACHE_PACKAGE, CACHE_REQUIRE, CACHE_EXTERNAL, CACHE_TEMPLATE]) {
+            for (const cache of [CACHE_PACKAGE, CACHE_REQUIRE, CACHE_TEMPLATE]) {
                 for (const name in cache) {
                     delete cache[name];
                 }
@@ -924,8 +923,8 @@ class Document extends core_1.Client {
         const config = this._transformConfig;
         const cacheData = config && options.cacheData;
         const cacheType = username && core_1.Client.enabled("memory.settings.users", username) ? true : this.cacheDir || core_1.Client.enabled("memory.settings.users");
-        let formatKey, hashKey, excludeKey;
-        if (cacheData && cacheType && !CACHE_EXTERNAL[excludeKey = moduleName + '_' + type + '_' + format] && (!config.exclude[type] || Array.isArray(config.exclude[type]) && !format.some(value => config.exclude[type].includes(value)) || Array.isArray(config.include[type]) && format.every(value => config.include[type].includes(value)))) {
+        let formatKey, hashKey;
+        if (cacheData && cacheType && (!config.exclude[type] || Array.isArray(config.exclude[type]) && !format.some(value => config.exclude[type].includes(value)) || Array.isArray(config.include[type]) && format.every(value => config.include[type].includes(value)))) {
             const { uri, etag } = cacheData;
             const encoding = (0, types_1.getEncoding)(cacheData.encoding);
             const algorithm = config.algorithm;
@@ -1009,7 +1008,7 @@ class Document extends core_1.Client {
         const imports = transform.imports || (transform.imports = {});
         const series = new transform_1.TransformSeries(type, code, options);
         series.init(this, __dirname);
-        let valid, excluded, userData, userImports, ignoreCache, storedLog, sourceFiles;
+        let valid, userData, userImports, ignoreCache, storedLog, sourceFiles;
         if (username && (transform = (_d = (_c = this.settings.users) === null || _c === void 0 ? void 0 : _c[username]) === null || _d === void 0 ? void 0 : _d.transform)) {
             userData = transform[type];
             userImports = transform.imports;
@@ -1058,8 +1057,8 @@ class Document extends core_1.Client {
                     }
                 }
             }
-            if (!baseSettings) {
-                excluded = !includes(name);
+            if (!baseSettings && !includes(name)) {
+                ignoreCache = true;
             }
             outputConfig || (outputConfig = {});
             if (plugin && baseConfig) {
@@ -1200,9 +1199,6 @@ class Document extends core_1.Client {
             return;
         }
         series.close(this);
-        if (excluded && excludeKey) {
-            CACHE_EXTERNAL[excludeKey] = true;
-        }
         if (!valid) {
             return;
         }
@@ -1217,7 +1213,7 @@ class Document extends core_1.Client {
         if (sourceFiles) {
             output.sourceFiles = sourceFiles;
         }
-        if (formatKey && !excluded && !ignoreCache) {
+        if (formatKey && !ignoreCache) {
             const { uri, etag } = cacheData;
             const formatData = { ...output, storedLog };
             const lastAccessed = Date.now();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/document",
-  "version": "0.7.23",
+  "version": "0.7.25",
   "description": "Document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,9 +20,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.7.23",
-    "@e-mc/db": "0.7.23",
-    "@e-mc/types": "0.7.23",
+    "@e-mc/core": "0.7.25",
+    "@e-mc/db": "0.7.25",
+    "@e-mc/types": "0.7.25",
     "chalk": "4.1.2",
     "domhandler": "^5.0.3",
     "domutils": "^3.1.0",