@e-mc/document 0.13.9 → 0.14.0

package/transform/index.js

@@ -1,9 +1,9 @@
 "use strict";
-exports.SourceMap = exports.TransformSeries = void 0;
-const fs = require("node:fs");
-const path = require("node:path");
-const types_1 = require("@e-mc/types");
-const core_1 = require("@e-mc/core");
+
+const fs = require('node:fs');
+const path = require('node:path');
+const { importESM, isErrorCode, isObject, isPlainObject, isString } = require('@e-mc/types');
+const { AbortComponent, Module, Permission } = require('@e-mc/core');
 const kTransformSeries = Symbol.for('document:transform:series:constructor');
 function parseMap(data, value) {
     let [mimeType, encoding] = data.split(';');
@@ -23,7 +23,7 @@ function toJSON(data) {
     }
 }
 function parseModuleArgs(startDir, packageName, version) {
-    if ((0, types_1.isObject)(startDir)) {
+    if (isObject(startDir)) {
         ({ startDir, packageName, version } = startDir);
     }
     if (!startDir && packageName && version && version !== 'latest') {
@@ -49,7 +49,7 @@ class Out {
         this.logQueued = undefined;
     }
 }
-class TransformSeries extends core_1.Module {
+class TransformSeries extends Module {
     type;
     static [kTransformSeries] = true;
     baseConfig = {};
@@ -80,7 +80,7 @@ class TransformSeries extends core_1.Module {
             this.#sourceMap = options.sourceMap instanceof SourceMap ? options.sourceMap : this.createSourceMap(code);
         }
         if (options.metadata) {
-            this.#metadata = (0, types_1.isPlainObject)(options.metadata) ? { ...options.metadata } : options.metadata;
+            this.#metadata = isPlainObject(options.metadata) ? { ...options.metadata } : options.metadata;
         }
     }
     reset() {
@@ -93,7 +93,7 @@ class TransformSeries extends core_1.Module {
     }
     init(instance, dirname) {
         if (instance.hasPermission('fs')) {
-            this.permission = core_1.Permission.clone(instance.permission, true);
+            this.permission = Permission.clone(instance.permission, true);
         }
         this.abortable = instance.abortable;
         this._moduleName = instance.moduleName + ':transform:' + this.type;
@@ -105,7 +105,7 @@ class TransformSeries extends core_1.Module {
             host.retain(this);
             this.#username = host.username;
         }
-        core_1.AbortComponent.attach(instance, this.signal);
+        AbortComponent.attach(instance, this.signal);
         return this;
     }
     createSourceMap(code) {
@@ -157,10 +157,10 @@ class TransformSeries extends core_1.Module {
             const pathname = startDir && this.findModule(startDir, packageName, version || this.version);
             let result;
             if (pathname) {
-                result = await (0, types_1.importESM)(pathname, false, true);
+                result = await importESM(pathname, false, true);
             }
             else if (packageName) {
-                result = await (0, types_1.importESM)(packageName);
+                result = await importESM(packageName);
             }
             if (result) {
                 return result;
@@ -181,7 +181,7 @@ class TransformSeries extends core_1.Module {
                             return pathname;
                         }
                         const data = require(path.join(pathname, 'package.json'));
-                        if ((0, types_1.isString)(data?.version)) {
+                        if (isString(data?.version)) {
                             if (version === data.version) {
                                 return pathname;
                             }
@@ -197,7 +197,7 @@ class TransformSeries extends core_1.Module {
                     }
                 }
                 catch (err) {
-                    if ((0, types_1.isErrorCode)(err, 'EACCES')) {
+                    if (isErrorCode(err, 'EACCES')) {
                         return '';
                     }
                 }
@@ -207,7 +207,7 @@ class TransformSeries extends core_1.Module {
         return '';
     }
     close(instance) {
-        core_1.AbortComponent.detach(instance, this.signal);
+        AbortComponent.detach(instance, this.signal);
         this.host?.release(this);
     }
     set code(value) {
@@ -272,7 +272,7 @@ class TransformSeries extends core_1.Module {
     }
     get packageVersion() {
         const packageName = this.packageName;
-        return packageName ? core_1.Module.getPackageVersion(packageName, { startDir: this.#modulesDir }) : '0.0.0';
+        return packageName ? Module.getPackageVersion(packageName, { startDir: this.#modulesDir }) : '0.0.0';
     }
     set host(value) {
         this._host = value;
@@ -284,13 +284,12 @@ class TransformSeries extends core_1.Module {
         return this.#username;
     }
 }
-exports.TransformSeries = TransformSeries;
 class SourceMap {
     static get SOURCE_MAPPING_URL() {
         return /[\r\n]*(?:(\/\/)|(\/\*))\s*[#@][ ]+sourceMappingURL=(data:[^,]+,)?(\S+)\s*(\*\/)?\r?\n?/g;
     }
     static findSourceMap(code, uri) {
-        if (code ||= uri && core_1.Module.readText(uri)) {
+        if (code ||= uri && Module.readText(uri)) {
             const pattern = this.SOURCE_MAPPING_URL;
             pattern.lastIndex = 0;
             let match;
@@ -302,7 +301,7 @@ class SourceMap {
                 }
                 else if (uri) {
                     const url = decodeURIComponent(match[4]);
-                    map = toJSON(core_1.Module.readText(path.isAbsolute(url) ? url : path.join(path.dirname(uri), url)));
+                    map = toJSON(Module.readText(path.isAbsolute(url) ? url : path.join(path.dirname(uri), url)));
                 }
                 if (map) {
                     return map;
@@ -314,10 +313,10 @@ class SourceMap {
         const pattern = this.SOURCE_MAPPING_URL;
         pattern.lastIndex = 0;
         const match = pattern.exec(value);
-        return match ? [value.substring(0, match.index) + value.substring(match.index + match[0].length), (match[3] || '') + match[4], match[3] && toJSON(parseMap(match[3], match[4])) || null] : [value];
+        return match ? [value.slice(0, match.index) + value.slice(match.index + match[0].length), (match[3] || '') + match[4], match[3] && toJSON(parseMap(match[3], match[4])) || null] : [value];
     }
     static isRaw(map) {
-        return (0, types_1.isObject)(map) && (0, types_1.isString)(map.mappings);
+        return isObject(map) && isString(map.mappings);
     }
     code;
     output = new Map();
@@ -379,7 +378,7 @@ class SourceMap {
             return map;
         }
         try {
-            return JSON.parse((0, types_1.isString)(map) || Buffer.isBuffer(map) ? map.toString('utf8') : map.toString());
+            return JSON.parse(isString(map) || Buffer.isBuffer(map) ? map.toString('utf8') : map.toString());
         }
         catch {
             return null;
@@ -397,4 +396,6 @@ class SourceMap {
         return this.#map;
     }
 }
+
 exports.SourceMap = SourceMap;
+exports.TransformSeries = TransformSeries;

package/util.d.ts

@@ -15,7 +15,8 @@ declare namespace util {
     function hasValue(target: string | string[] | undefined, ...values: string[]): boolean;
     function getModuleName(err: unknown): string | undefined;
     function removeInternalProperties<T extends object>(value: T, retaining?: string[]): T;
-    function isObject<T = object>(value: unknown): value is T;
+    function isObject<T extends object>(value: unknown): value is T;
+    function isPlainObject<T = PlainObject>(value: unknown): value is T;
 }
 
 export = util;

package/util.js

@@ -1,33 +1,17 @@
 "use strict";
-exports.isObject = exports.PATTERN_PARENTHESIS = void 0;
-exports.loadPlugins = loadPlugins;
-exports.replaceAll = replaceAll;
-exports.concatString = concatString;
-exports.spliceString = spliceString;
-exports.spliceMatch = spliceMatch;
-exports.splitEnclosing = splitEnclosing;
-exports.trimQuote = trimQuote;
-exports.wrapQuote = wrapQuote;
-exports.appendSuffix = appendSuffix;
-exports.getIndent = getIndent;
-exports.getNewline = getNewline;
-exports.getHashData = getHashData;
-exports.hasValue = hasValue;
-exports.getModuleName = getModuleName;
-exports.removeInternalProperties = removeInternalProperties;
-const path = require("node:path");
-const types_1 = require("@e-mc/types");
-Object.defineProperty(exports, "isObject", { enumerable: true, get: function () { return types_1.isObject; } });
+
+const path = require('node:path');
+const { isArray, isError, isObject, isPlainObject, isString, requireESM } = require('@e-mc/types');
 function loadPlugins(plugins, map) {
     const result = [];
     const items = (Array.isArray(plugins) ? plugins : [plugins]).map(value => {
         let name, options;
-        if ((0, types_1.isString)(value)) {
+        if (isString(value)) {
             name = value;
         }
         else if (Array.isArray(value)) {
             [name, options] = value;
-            if (!(0, types_1.isString)(name)) {
+            if (!isString(name)) {
                 return null;
             }
         }
@@ -42,10 +26,10 @@ function loadPlugins(plugins, map) {
     });
     for (const plugin of items) {
         if (plugin) {
-            let method = typeof plugin[0] === 'function' ? plugin[0] : require(plugin[0]), options = plugin[1];
-            if ((0, types_1.isPlainObject)(method)) {
+            let method = typeof plugin[0] === 'function' ? plugin[0] : requireESM(plugin[0]), options = plugin[1];
+            if (isPlainObject(method)) {
                 const attr = options?.__default__;
-                if ((0, types_1.isString)(attr)) {
+                if (isString(attr)) {
                     method = method[attr];
                     options = { ...options };
                     delete options.__default__;
@@ -61,14 +45,14 @@ function replaceAll(source, valueOf, opening = '{{', closing = '}}') {
         if (i > 0) {
             const j = b.indexOf(closing);
             if (j !== -1) {
-                b = valueOf(b.substring(0, j)) + b.substring(j + closing.length);
+                b = valueOf(b.slice(0, j)) + b.slice(j + closing.length);
             }
         }
         return a + b;
     }, '');
 }
 function concatString(values, newline) {
-    if ((0, types_1.isArray)(values)) {
+    if (isArray(values)) {
         newline ||= values.find(item => item.indexOf('\r') !== -1) ? '\r\n' : '\n';
         return values.reduce((a, b) => a + newline + b, '');
     }
@@ -78,7 +62,7 @@ function spliceString(source, startIndex, endIndex, content, pattern) {
     if (pattern) {
         pattern.lastIndex = startIndex + content.length;
     }
-    return source.substring(0, startIndex) + content + source.substring(endIndex);
+    return source.slice(0, startIndex) + content + source.slice(endIndex);
 }
 function spliceMatch(source, match, content, pattern) {
     const index = match.index;
@@ -129,7 +113,8 @@ function splitEnclosing(value, pattern, options, opening = '(', closing = ')') {
                     let start, startWith;
                     ({ trim, start, startWith, count = 0 } = options);
                     if (startWith !== undefined) {
-                        result.push(value.substring(0, position = startWith));
+                        position = startWith;
+                        result.push(value.slice(0, position));
                     }
                     else if (start !== undefined) {
                         position = start;
@@ -140,7 +125,7 @@ function splitEnclosing(value, pattern, options, opening = '(', closing = ')') {
         }
         while ((index = nextIndex()) !== -1) {
             if (index !== position) {
-                result.push(value.substring(position, index));
+                result.push(value.slice(position, index));
             }
             found: {
                 for (let i = index + end + 1, open = 1, close = 0; i < length; ++i) {
@@ -157,7 +142,7 @@ function splitEnclosing(value, pattern, options, opening = '(', closing = ')') {
                             index += opening.length;
                         }
                         position = i + 1;
-                        result.push(value.substring(index, position - (trim ? closing.length : 0)));
+                        result.push(value.slice(index, position - (trim ? closing.length : 0)));
                         if (position === length) {
                             return result;
                         }
@@ -179,7 +164,7 @@ function splitEnclosing(value, pattern, options, opening = '(', closing = ')') {
         return [value];
     }
     if (position < length) {
-        result.push(value.substring(position));
+        result.push(value.slice(position));
     }
     return result;
 }
@@ -194,7 +179,7 @@ function wrapQuote(value, quote = '"') {
 }
 function appendSuffix(filename, value, separator = '-') {
     const ext = path.extname(filename);
-    return ext && value ? filename.substring(0, filename.length - ext.length) + separator + value + ext : filename;
+    return ext && value ? filename.slice(0, filename.length - ext.length) + separator + value + ext : filename;
 }
 function getIndent(value, spaces = 4) {
     const match = /^(\t|[ ]{2,}[^\s])/m.exec(value);
@@ -219,20 +204,20 @@ function hasValue(target, ...values) {
         if (typeof target === 'string') {
             return values.includes(target);
         }
-        if ((0, types_1.isArray)(target)) {
+        if (isArray(target)) {
             return target.some(item => values.includes(item));
         }
     }
     return false;
 }
 function getModuleName(err) {
-    const match = err instanceof Error && /Cannot find (?:module|package) '([^']+)'/.exec(err.message);
+    const match = isError(err) && /Cannot find (?:module|package) '([^']+)'/.exec(err.message);
     if (match) {
         return match[1];
     }
 }
 function removeInternalProperties(value, retaining) {
-    if ((0, types_1.isObject)(value)) {
+    if (isObject(value)) {
         for (const prop in value) {
             if (Object.hasOwn(value, prop)) {
                 if (retaining) {
@@ -248,4 +233,23 @@ function removeInternalProperties(value, retaining) {
     }
     return value;
 }
-exports.PATTERN_PARENTHESIS = '(?:[^()]+(?=\\))|[^()]|\\([^()]*\\(+|\\([^()]*\\)|(?:\\)[^()]+)?\\)*?)+';
+const PATTERN_PARENTHESIS = '(?:[^()]+(?=\\))|[^()]|\\([^()]*\\(+|\\([^()]*\\)|(?:\\)[^()]+)?\\)*?)+';
+
+exports.PATTERN_PARENTHESIS = PATTERN_PARENTHESIS;
+exports.appendSuffix = appendSuffix;
+exports.concatString = concatString;
+exports.getHashData = getHashData;
+exports.getIndent = getIndent;
+exports.getModuleName = getModuleName;
+exports.getNewline = getNewline;
+exports.hasValue = hasValue;
+exports.isObject = isObject;
+exports.isPlainObject = isPlainObject;
+exports.loadPlugins = loadPlugins;
+exports.removeInternalProperties = removeInternalProperties;
+exports.replaceAll = replaceAll;
+exports.spliceMatch = spliceMatch;
+exports.spliceString = spliceString;
+exports.splitEnclosing = splitEnclosing;
+exports.trimQuote = trimQuote;
+exports.wrapQuote = wrapQuote;