@e-mc/document 0.14.0 → 0.14.1

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.14.0/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.14.1/lib/index.d.ts)
 
 ```typescript
 import type { DataSource, ViewEngine } from "./squared";
@@ -39,6 +39,7 @@ interface IDocument extends IClient<IFileManager, DocumentModule, TransformCallb
     resolveDir(name: string, ...paths: string[]): string | undefined;
     locateSourceFiles(file: ExternalAsset, code?: string, bundleContent?: string[]): ((imports?: ImportModule) => SourceInput | undefined);
     resolveSourceFile(file: ExternalAsset): ((code?: string, imports?: ImportModule) => SourceInput<string> | undefined);
+    resolvePackageJSONExports(uri: string, base?: string | URL): string | undefined;
     tryParse(source: string, format: string, options?: Record<string | number | symbol, unknown>): unknown;
     forDb(item: DataSource): boolean;
     hasEval(name: string): boolean;
@@ -92,7 +93,7 @@ interface DocumentConstructor extends ModuleConstructor {
 
 ```typescript
 import type { PermittedDirectories } from "./core";
-import type { DbModule, DbSettings, DocumentComponentOptions, PurgeComponent } from "./settings";
+import type { DbModule, DbSettings, DocumentComponentOptions, ImportModule, PurgeComponent } from "./settings";
 
 interface DocumentModule {
     // handler: "@pi-r/chrome";
@@ -111,12 +112,12 @@ interface DocumentModule {
             filename?: string;
         };
     };
-    imports?: StringMap;
+    imports?: ImportModule;
     settings?: {
         broadcast_id?: string | string[];
         users?: Record<string, {
             extensions?: string[] | null;
-            imports?: StringMap;
+            imports?: ImportModule;
             imports_strict?: boolean;
             pages?: unknown;
             transform?: unknown;
@@ -187,14 +188,14 @@ NOTE: **@e-mc/document** is an abstract base class and cannot be instantiated. *
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.14.0/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.14.0/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.14.0/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.14.0/lib/document.d.ts
-- https://www.unpkg.com/@e-mc/types@0.14.0/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.14.0/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.14.0/lib/settings.d.ts
-- https://www.unpkg.com/@e-mc/types@0.14.0/lib/watch.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.1/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.1/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.1/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.1/lib/document.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.1/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.1/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.1/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.1/lib/watch.d.ts
 
 ## LICENSE
 

package/index.js

@@ -2,17 +2,22 @@
 
 const path = require('node:path');
 const fs = require('node:fs');
+const mod = require('node:module');
 const pm = require('picomatch');
 const chalk = require('chalk');
+const { pathToFileURL } = require('node:url');
 const { toUSVString } = require('node:util');
 const { load } = require('js-yaml');
-const { IMPORT_MAP, asExt, asFunction, cloneObject, coerceObject, createAbortError, errorMessage, errorValue, escapePattern, formatSize, getEncoding, hasGlob, hashKey, importESM, incrementUUID, isArray, isEmpty, isError, isFunction, isObject, isPlainObject, isString, parseExpires, requireESM } = require('@e-mc/types');
+const { IMPORT_MAP, asExt, asFunction, cloneObject, coerceObject, createAbortError, errorMessage, errorValue, escapePattern, formatSize, getEncoding, hasGlob, hashKey, importESM, incrementUUID, isArray, isEmpty, isError, isFunction, isObject, isPlainObject, isString, manageGlobalObject, parseExpires, requireESM, supported } = require('@e-mc/types');
 const { Client } = require('@e-mc/core');
 const Db = require('@e-mc/db');
 const { SourceMap, TransformSeries } = require('@e-mc/document/transform');
 const { XmlWriter } = require('@e-mc/document/parse');
 const { PATTERN_PARENTHESIS, appendSuffix, concatString, getHashData, getIndent, getModuleName, getNewline, spliceString } = require('@e-mc/document/util');
 const kDocument = Symbol.for('document:constructor');
+const SUPPORTED_GLOB = supported(22);
+const SUPPORTED_PACKAGEJSON = supported(23, 2) || supported(22, 14, true);
+const REGEXP_PACKAGEURI = /^(?:npm:)?((?:@[a-z\d-*~][a-z\d-*._~]*\/)?[a-z\d-~][a-z\d-._~]*\/.+)$/;
 const CACHE_PACKAGE = new Map();
 const CACHE_CONFIG = new Map();
 const CACHE_TEMPLATE = new Map();
@@ -27,8 +32,8 @@ function initCache() {
     CACHE_ETAG = Object.create(null);
     CACHE_CODE = Object.create(null);
     CACHE_HASH = Object.create(null);
-    CACHE_PICOMATCH = Object.create(null);
     CACHE_EXTERNAL = Object.create(null);
+    CACHE_PICOMATCH = Object.create(null);
 }
 function deleteTransform(map, key, timeout) {
     if (timeout) {
@@ -50,12 +55,17 @@ function normalizeDir(value, check) {
     }
     return value.at(-1) === sep ? value : value + sep;
 }
+function joinSpecifier(baseDir, specifier) {
+    const result = path.join(baseDir, specifier);
+    return Client.PLATFORM_WIN32 ? result.toLowerCase() : result;
+}
 function cloneConfigItems(items) {
     const [a, b, c] = items;
     return [a, (typeof b === 'object' ? cloneObject(b, true) : b), typeof c === 'object' ? cloneObject(c, true) : c];
 }
 const isExcluded = (type, name, config, cacheData) => !(config?.hasType(type, name) || cacheData?.override === true);
 const wrapCount = (value) => chalk.grey('(') + value + chalk.grey(')');
+const validateExports = (value) => typeof value === 'string' && value.startsWith('./') && !/\/\.{1,2}\//.test(value);
 const fixHint = (warningCount, errorCount, value) => warningCount > 0 || errorCount > 0 ? ':' + value : '';
 const compareValue = (value) => value.replace(/["'()]/g, '').trim();
 const toPath = (uri, hostname) => path.resolve(hostname[1], uri.slice(normalizeDir(hostname[0]).length).split('?')[0]);
@@ -635,6 +645,7 @@ class Document extends Client {
     _transformConfig = null;
     _mimeMap = null;
     _imports = null;
+    _packageJSON = { exports: false };
     constructor(data) {
         super(data);
         const transform = this.settingsOf('transform', 'cache');
@@ -648,8 +659,23 @@ class Document extends Client {
         if (config) {
             ({ baseUrl, ignoreModules, ignoreExtensions } = config);
             const users = this.getUserSettings();
-            if (Array.isArray(users?.extensions)) {
-                this._extensions = users.extensions.slice(0);
+            let package_json = this.settings.package_json;
+            if (users) {
+                if (Array.isArray(users.extensions)) {
+                    this._extensions = users.extensions.slice(0);
+                }
+                if (users.package_json) {
+                    package_json = users.package_json;
+                }
+            }
+            let jsonExports = package_json?.exports;
+            if (jsonExports) {
+                if (typeof jsonExports !== 'string') {
+                    this._packageJSON.exports = true;
+                }
+                else if (Client.isDir(jsonExports = path.resolve(jsonExports))) {
+                    this._packageJSON.exports = jsonExports;
+                }
             }
             if (baseUrl) {
                 let pages = this.settings.pages;
@@ -940,7 +966,7 @@ class Document extends Client {
         if (!isPlainObject(imports)) {
             return;
         }
-        const importsStrict = this.getUserSettings()?.imports_strict ?? this.settings.imports_strict;
+        const importsStrict = this.isImportsStrict();
         const scopes = (importsStrict ? this.findSourceScope(uri, imports) : []).concat([isPlainObject(imports.imports) ? imports.imports : imports]);
         const integrity = isPlainObject(imports.integrity) ? imports.integrity : undefined;
         const protocol = Client.isURL(uri);
@@ -1006,6 +1032,9 @@ class Document extends Client {
                 return toPosix(result);
             }
         }
+        if (!protocol && this._packageJSON.exports) {
+            return this.resolvePackageJSONExports(uri);
+        }
     }
     locateSourceFiles(file, code, bundleContent) {
         return (imports = this.imports) => {
@@ -1078,6 +1107,116 @@ class Document extends Client {
             }
         };
     }
+    resolvePackageJSONExports(uri, base) {
+        if (uri.startsWith('./')) {
+            const cwd = [base && (base = Client.resolveFile(base)) && path.resolve(base) || this.host?.baseDirectory];
+            if (SUPPORTED_PACKAGEJSON && cwd[0]) {
+                try {
+                    const pathname = mod.findPackageJSON(pathToFileURL(cwd[0]));
+                    if (pathname) {
+                        cwd[0] = pathname;
+                    }
+                }
+                catch {
+                }
+            }
+            if (!base) {
+                cwd.push(process.cwd());
+            }
+            for (let i = 0; i < cwd.length; ++i) {
+                const baseDir = cwd[i];
+                if (baseDir) {
+                    try {
+                        const pathname = path.join(baseDir, 'package.json');
+                        if (fs.existsSync(pathname)) {
+                            const packageJSON = (i === 0 ? JSON.parse(fs.readFileSync(pathname, 'utf8')) : require(pathname));
+                            if (isPlainObject(packageJSON?.exports)) {
+                                const packageExports = packageJSON.exports;
+                                let value = packageExports[uri];
+                                if (value === null) {
+                                    return;
+                                }
+                                if (validateExports(value) && Client.isFile(value = path.join(baseDir, value))) {
+                                    return value;
+                                }
+                                const subDir = [];
+                                const globDir = [];
+                                for (const specifier in packageExports) {
+                                    const target = packageExports[specifier];
+                                    let items;
+                                    if (validateExports(target)) {
+                                        items = [target];
+                                    }
+                                    else if (isArray(items)) {
+                                        items = items.filter(item => validateExports(item));
+                                    }
+                                    if (isArray(items) && validateExports(specifier)) {
+                                        if (specifier.at(-1) === '/') {
+                                            subDir.push([specifier, items]);
+                                        }
+                                        else if (SUPPORTED_GLOB && specifier.endsWith('/*')) {
+                                            globDir.push([specifier.slice(0, -1), items.map(item => item.replaceAll('/*/', '/**/'))]);
+                                        }
+                                    }
+                                }
+                                uri = joinSpecifier(baseDir, uri);
+                                for (let [specifier, items] of subDir.sort((a, b) => b.length - a.length)) {
+                                    if (uri.startsWith(specifier = joinSpecifier(baseDir, specifier))) {
+                                        for (const target of items) {
+                                            const result = path.join(baseDir, target, uri.slice(specifier.length));
+                                            if (Client.isFile(result)) {
+                                                return result;
+                                            }
+                                            if (this.isImportsStrict()) {
+                                                break;
+                                            }
+                                        }
+                                    }
+                                }
+                                for (let [specifier, items] of globDir.sort((a, b) => b.length - a.length)) {
+                                    if (uri.startsWith(specifier = joinSpecifier(baseDir, specifier))) {
+                                        for (const target of items) {
+                                            try {
+                                                const files = fs.globSync(target);
+                                                if (files.length > 0) {
+                                                    const filename = uri.slice(specifier.length - 1);
+                                                    const result = files.filter(entry => entry.endsWith(filename) && Client.isFile(entry)).sort((a, b) => a.length - b.length).at(0);
+                                                    if (result) {
+                                                        return result;
+                                                    }
+                                                }
+                                                else if (this.isImportsStrict()) {
+                                                    break;
+                                                }
+                                            }
+                                            catch {
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    catch {
+                    }
+                }
+            }
+        }
+        else if (!uri.startsWith('..') && !path.isAbsolute(uri)) {
+            let baseUrl = this._packageJSON.exports;
+            if (typeof baseUrl === 'string' && Client.isFile(baseUrl = path.join(baseUrl, uri))) {
+                return baseUrl;
+            }
+            const match = REGEXP_PACKAGEURI.exec(uri);
+            if (match) {
+                try {
+                    return require.resolve(match[1]);
+                }
+                catch {
+                }
+            }
+        }
+    }
     tryParse(source, format, options) {
         try {
             switch (format.toLowerCase()) {
@@ -1493,6 +1632,9 @@ class Document extends Client {
         }
         return output;
     }
+    isImportsStrict() {
+        return !!(this.getUserSettings()?.imports_strict ?? this.settings.imports_strict);
+    }
     #checkIntegrity(metadata, url, localUri) {
         const integrity = metadata?.[url];
         if (!isString(integrity)) {
@@ -1570,5 +1712,9 @@ class Document extends Client {
     }
 }
 initCache();
+manageGlobalObject(CACHE_PACKAGE);
+manageGlobalObject(CACHE_VIEWENGINE);
+manageGlobalObject(CACHE_EXTERNAL);
+manageGlobalObject(CACHE_PICOMATCH);
 
 module.exports = Document;

package/package.json

@@ -1,12 +1,9 @@
 {
   "name": "@e-mc/document",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "description": "Document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/anpham6/e-mc.git",
@@ -19,9 +16,9 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.14.0",
-    "@e-mc/db": "0.14.0",
-    "@e-mc/types": "0.14.0",
+    "@e-mc/core": "0.14.1",
+    "@e-mc/db": "0.14.1",
+    "@e-mc/types": "0.14.1",
     "chalk": "4.1.2",
     "domhandler": "^5.0.3",
     "domutils": "^3.2.2",