@e-mc/document 0.5.4 → 0.6.1

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Mile Square Park
+Copyright 2023 Studio Trigger
 
 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/README.md

@@ -1,5 +1,7 @@
 # @e-mc/document
 
+PEP 402 - Forever Ryuko
+
 ## LICENSE
 
 MIT

package/asset.d.ts

@@ -1,8 +1,8 @@
-import type { ExternalAsset } from '../types/lib/asset';
+import type { ExternalAsset, InitialValue } from '../types/lib/asset';
 
 declare namespace asset {
     function isEqual(item: ExternalAsset, other: ExternalAsset): boolean;
-    function setInitialValue(file: ExternalAsset, cacheable?: boolean): void;
+    function setInitialValue(file: ExternalAsset, cacheable?: boolean): InitialValue;
 }
 
 export = asset;

package/index.js

@@ -11,24 +11,6 @@ const db_1 = require("@e-mc/db");
 const util_1 = require("@e-mc/document/util");
 const transform_1 = require("@e-mc/document/transform");
 const parse_1 = require("@e-mc/document/parse");
-const PIR_PLUGINS = Object.freeze({
-    "@babel/core": "@pi-r/babel",
-    "clean-css": "@pi-r/clean-css",
-    "csso": "@pi-r/csso",
-    "eslint": "@pi-r/eslint",
-    "html-minifier": "@pi-r/html-minifier",
-    "html-minifier-terser": "@pi-r/html-minifier-terser",
-    "html-validate": "@pi-r/html-validate",
-    "postcss": "@pi-r/postcss",
-    "posthtml": "@pi-r/posthtml",
-    "prettier": "@pi-r/prettier",
-    "rollup": "@pi-r/rollup",
-    "sass": "@pi-r/sass",
-    "stylelint": "@pi-r/stylelint",
-    "svgo": "@pi-r/svgo",
-    "terser": "@pi-r/terser",
-    "uglify-js": "@pi-r/uglify-js"
-});
 const CACHE_PACKAGE = {};
 const CACHE_REQUIRE = {};
 const CACHE_ETAG = {};
@@ -333,6 +315,7 @@ class Document extends core_1.Client {
         this._dataSource = null;
         this._transformConfig = null;
         this._mimeMap = null;
+        this._imports = null;
         const transform = this.settingsOf('transform', 'cache');
         if (transform !== undefined) {
             this.customize({ transform });
@@ -364,7 +347,10 @@ class Document extends core_1.Client {
                 }
                 if ((0, types_1.isPlainObject)(pages)) {
                     let mimeMap;
-                    if (!(0, types_1.isPlainObject)(mimeMap = pages[baseUrl])) {
+                    if ((0, types_1.isPlainObject)(mimeMap = pages[baseUrl])) {
+                        mimeMap = { ...mimeMap };
+                    }
+                    else {
                         const items = [];
                         for (const pattern in pages) {
                             const item = pages[pattern];
@@ -387,8 +373,8 @@ class Document extends core_1.Client {
                             items.sort((a, b) => typeof a.ordinal === 'number' && typeof b.ordinal === 'number' ? a.ordinal - b.ordinal : 0);
                             mimeMap = items.reduce((a, b) => Object.assign(a, b), {});
                         }
-                        else {
-                            mimeMap = items[0];
+                        else if (items.length) {
+                            mimeMap = { ...items[0] };
                         }
                     }
                     if (mimeMap) {
@@ -896,10 +882,8 @@ class Document extends core_1.Client {
         return null;
     }
     async transform(type, code, format, options = {}) {
-        var _a;
-        let transform = this.settings.transform;
-        const data = transform?.[type];
-        if (!(0, types_1.isObject)(data)) {
+        let transform = this.settings.transform, data;
+        if (!transform || !(0, types_1.isObject)(data = transform[type])) {
             return;
         }
         format = typeof format === 'string' ? format.trim().split(/\s*\+\s*/) : format.map(item => typeof item === 'string' ? item.trim() : '');
@@ -990,7 +974,7 @@ class Document extends core_1.Client {
         if (cacheData) {
             delete options.cacheData;
         }
-        const imports = (_a = transform).imports || (_a.imports = {});
+        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;
@@ -1127,8 +1111,8 @@ class Document extends core_1.Client {
                         let transformer = CACHE_PACKAGE[plugin + username];
                         if (!transformer) {
                             try {
-                                let pkg = this.resolveDir('package', plugin + '.js') || userImports?.[plugin] || imports[plugin] || PIR_PLUGINS[plugin];
-                                if (pkg) {
+                                let pkg = this.resolveDir('package', plugin + '.js') || userImports?.[plugin] || imports[plugin] || util_1.IMPORTS[plugin];
+                                if ((0, types_1.isString)(pkg)) {
                                     const match = /^(@?\S+)@(\d+(?:\.\d+(?:\.\S+)?)?|[a-z]+)$/.exec(pkg);
                                     if (match) {
                                         pkg = match[1];
@@ -1139,12 +1123,13 @@ class Document extends core_1.Client {
                                 else {
                                     transformer = context;
                                     context = this;
+                                    pkg = undefined;
+                                }
+                                if (transformer && typeof transformer !== 'function') {
+                                    transformer = transformer.default;
                                 }
                                 if (typeof transformer !== 'function') {
-                                    transformer && (transformer = transformer.default);
-                                    if (typeof transformer !== 'function') {
-                                        throw (0, types_1.errorMessage)(plugin, pkg || name, 'Invalid function');
-                                    }
+                                    throw (0, types_1.errorMessage)(plugin, pkg || name, 'Invalid function');
                                 }
                                 if (pkg) {
                                     CACHE_PACKAGE[plugin + username] = transformer;
@@ -1284,6 +1269,27 @@ class Document extends core_1.Client {
         }
         return this._dataSource || [];
     }
+    set imports(value) {
+        if (!(0, types_1.isPlainObject)(value)) {
+            this._imports = null;
+            return;
+        }
+        let imports = this._imports;
+        if (imports) {
+            this._imports = Object.assign(imports, value);
+        }
+        else {
+            const username = this.host?.username;
+            imports = username && this.settings.users?.[username]?.imports || this.module.imports;
+            this._imports = Object.assign(this._imports || {}, (0, types_1.isPlainObject)(imports) ? imports : undefined, value);
+        }
+    }
+    get imports() {
+        if (!this._imports) {
+            this.imports = {};
+        }
+        return this._imports;
+    }
     get watching() {
         return this.assets.some(item => item.watch);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/document",
-  "version": "0.5.4",
+  "version": "0.6.1",
   "description": "Document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/anpham6/e-mc.git",
+    "url": "https://github.com/anpham6/e-mc.git",
     "directory": "src/document"
   },
   "keywords": [
@@ -20,9 +20,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.5.4",
-    "@e-mc/db": "0.5.4",
-    "@e-mc/types": "0.5.4",
+    "@e-mc/core": "0.6.1",
+    "@e-mc/db": "0.6.1",
+    "@e-mc/types": "0.6.1",
     "chalk": "4.1.2",
     "htmlparser2": "^9.0.0",
     "js-yaml": "^4.1.0",

package/parse/index.js

@@ -11,7 +11,7 @@ var IGNORE_FLAG;
     IGNORE_FLAG[IGNORE_FLAG["NONE"] = 0] = "NONE";
     IGNORE_FLAG[IGNORE_FLAG["INTERIOR"] = 1] = "INTERIOR";
     IGNORE_FLAG[IGNORE_FLAG["LOCATOR"] = 2] = "LOCATOR";
-})(IGNORE_FLAG = exports.IGNORE_FLAG || (exports.IGNORE_FLAG = {}));
+})(IGNORE_FLAG || (exports.IGNORE_FLAG = IGNORE_FLAG = {}));
 const Parser = htmlparser2.Parser;
 const DomHandler = domhandler.DomHandler;
 const CACHE_TAGNAME = {};

package/transform/index.js

@@ -312,6 +312,6 @@ class SourceMap {
         return this[kMap];
     }
 }
+exports.SourceMap = SourceMap;
 _d = kMap;
 SourceMap.RE_SOURCE_MAPPING_URL = /(?:\r\n|\n)*(?:(\/\/)|(\/\*))\s*[#@][ ]+sourceMappingURL=(data:[^,]+,)?(\S+)\s*(\*\/)?\r?\n?/g;
-exports.SourceMap = SourceMap;

package/util.d.ts

@@ -1,4 +1,5 @@
 declare namespace util {
+    const IMPORTS: Record<string, string | undefined>;
     function loadPlugins<T = unknown>(name: string | unknown[], plugins?: unknown[]): T[];
     function replaceAll(source: string, valueOf: (name: string) => string, opening?: string, closing?: string): string;
     function concatString(values: string[] | string | undefined, newline?: string): string;

package/util.js

@@ -1,9 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isObject = exports.removeInternalProperties = exports.getModuleName = exports.hasValue = exports.getHashData = exports.getNewline = exports.getIndent = exports.appendSuffix = exports.splitEnclosing = exports.concatString = exports.replaceAll = exports.loadPlugins = void 0;
+exports.isObject = exports.removeInternalProperties = exports.getModuleName = exports.hasValue = exports.getHashData = exports.getNewline = exports.getIndent = exports.appendSuffix = exports.splitEnclosing = exports.concatString = exports.replaceAll = exports.loadPlugins = exports.IMPORTS = void 0;
 const path = require("path");
 const types_1 = require("@e-mc/types");
 Object.defineProperty(exports, "isObject", { enumerable: true, get: function () { return types_1.isObject; } });
+exports.IMPORTS = {
+    "@babel/core": "@pi-r/babel",
+    "clean-css": "@pi-r/clean-css",
+    "csso": "@pi-r/csso",
+    "eslint": "@pi-r/eslint",
+    "html-minifier": "@pi-r/html-minifier",
+    "html-minifier-terser": "@pi-r/html-minifier-terser",
+    "html-validate": "@pi-r/html-validate",
+    "postcss": "@pi-r/postcss",
+    "posthtml": "@pi-r/posthtml",
+    "prettier": "@pi-r/prettier",
+    "rollup": "@pi-r/rollup",
+    "sass": "@pi-r/sass",
+    "stylelint": "@pi-r/stylelint",
+    "svgo": "@pi-r/svgo",
+    "terser": "@pi-r/terser",
+    "uglify-js": "@pi-r/uglify-js"
+};
 function loadPlugins(name, plugins = []) {
     if (Array.isArray(name)) {
         plugins = name;