@e-mc/document 0.12.17 → 0.12.18

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.12.17/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.12.18/lib/index.d.ts)
 
 ```typescript
 import type { DataSource, ViewEngine } from "./squared";
@@ -187,14 +187,14 @@ NOTE: **@e-mc/document** is an abstract base class and cannot be instantiated. *
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.12.17/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.17/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.17/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.17/lib/document.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.17/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.17/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.17/lib/settings.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.17/lib/watch.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.18/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.18/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.18/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.18/lib/document.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.18/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.18/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.18/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.18/lib/watch.d.ts
 
 ## LICENSE
 

package/index.js

@@ -15,7 +15,6 @@ const kDocument = Symbol.for('document:constructor');
 const CACHE_PACKAGE = {};
 const CACHE_TEMPLATE = {};
 const CACHE_VIEWENGINE = new Map();
-const CACHE_EXTERNAL = {};
 const CACHE_ETAG = {};
 const CACHE_CODE = {};
 const CACHE_HASH = {};
@@ -237,7 +236,7 @@ class TransformConfig {
                     value = 0;
                 }
                 else if ((value = (0, types_1.formatSize)(limit)) === 0) {
-                    return;
+                    return false;
                 }
             }
             else {
@@ -350,7 +349,7 @@ class Document extends core_1.Client {
                     delete cache[name];
                 }
             }
-            for (const cache of [CACHE_PACKAGE, CACHE_EXTERNAL, CACHE_TEMPLATE]) {
+            for (const cache of [CACHE_PACKAGE, CACHE_TEMPLATE]) {
                 for (const name in cache) {
                     delete cache[name];
                 }
@@ -1206,10 +1205,10 @@ class Document extends core_1.Client {
         const username = this.host?.username || '';
         const config = this._transformConfig;
         const cacheData = config && options.cacheData;
-        let cache = null, excludeKey;
+        let cache = null;
         if (cacheData) {
             const cacheDir = this.hasPermission('memory.user') || this.cacheDir || this.hasPermission('memory');
-            if (cacheDir && !CACHE_EXTERNAL[excludeKey = this.moduleName + '_' + type + '_' + format] && config.valid(type, format)) {
+            if (cacheDir && config.valid(type, format)) {
                 const { uri, etag } = cacheData;
                 const encoding = (0, types_1.getEncoding)(cacheData.encoding);
                 const hashOpts = core_1.Client.asString(options.external) + core_1.Client.asString(options.metadata);
@@ -1239,7 +1238,7 @@ class Document extends core_1.Client {
         const imports = transform.imports ||= {};
         const series = new transform_1.TransformSeries(type, code, options);
         series.init(this, __dirname);
-        let valid = false, excluded = false, userData, userImports, ignoreCache = false, storedLog, sourceFiles;
+        let valid = false, userData, userImports, ignoreCache = false, storedLog, sourceFiles;
         if (username && (0, types_1.isObject)(transform = this.getUserSettings()?.transform)) {
             if ((0, types_1.isObject)(transform[type])) {
                 userData = transform[type];
@@ -1280,8 +1279,8 @@ class Document extends core_1.Client {
                     }
                 }
             }
-            if (!baseSettings) {
-                excluded = isExcluded(type, name, config, cacheData);
+            if (!baseSettings && isExcluded(type, name, config, cacheData)) {
+                ignoreCache = true;
             }
             outputConfig ||= {};
             if (plugin && baseConfig) {
@@ -1449,9 +1448,6 @@ class Document extends core_1.Client {
             return;
         }
         series.close(this);
-        if (excluded && excludeKey) {
-            CACHE_EXTERNAL[excludeKey] = true;
-        }
         if (!valid) {
             return;
         }
@@ -1466,7 +1462,7 @@ class Document extends core_1.Client {
         if (sourceFiles) {
             output.sourceFiles = sourceFiles;
         }
-        if (!excluded && !ignoreCache && cache?.formatType) {
+        if (!ignoreCache && cache?.formatType) {
             void cache.finalize(type, code, { ...output, log: storedLog });
         }
         return output;

package/package.json

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