@pi-r/chrome 0.6.2 → 0.6.4

package/index.js

@@ -1302,6 +1302,7 @@ class ChromeDocument extends Document {
     forDb(item) {
         switch (item.source) {
             case 'cloud':
+            case 'json':
             case 'uri':
             case 'local':
             case 'export':
@@ -1718,12 +1719,11 @@ class ChromeDocument extends Document {
             const cloudUrl = endpoint ? url.replace(endpoint, '') : url;
             file.cloudUrl = cloudUrl;
             if (inlineUrlCloud) {
-                const htmlFile = this.htmlFile;
                 const pattern = new RegExp((0, types_1.escapePattern)(inlineUrlCloud), 'g');
                 for (const item of this.editing) {
                     if (item.inlineUrlCloudMap?.[inlineUrlCloud]) {
                         const source = host.getUTF8String(item);
-                        const output = source.replace(pattern, endpoint && item !== htmlFile && cloudUrl.includes('/') ? url : cloudUrl);
+                        const output = source.replace(pattern, endpoint && item.imported && cloudUrl.includes('/') ? url : cloudUrl);
                         if (source !== output) {
                             item.sourceUTF8 = output;
                             item.modified = true;
@@ -2294,43 +2294,46 @@ class ChromeDocument extends Document {
                 const detectWidth = domElement.getAttribute('width') === 'detect';
                 const detectHeight = domElement.getAttribute('height') === 'detect';
                 if (detectWidth || detectHeight) {
-                    let width = 0, height = 0, buffer = null;
+                    let width = 0, height = 0, buffer = null, packageName;
+                    const addLog = (dimension) => this.addLog(types_1.STATUS_TYPE.WARN, 'Could not detect image ' + dimension, packageName || this.moduleName, item.localUri ? path.basename(item.localUri) : item.filename);
                     if (isImage(item.mimeType) && (buffer = host.getBuffer(item))) {
-                        let dimensions;
                         try {
-                            dimensions = require('probe-image-size').sync(buffer);
+                            ({ width, height } = require(packageName = 'image-size').imageSize(buffer));
                         }
                         catch {
-                        }
-                        if (dimensions) {
-                            ({ width, height } = dimensions);
-                        }
-                        else {
                             try {
-                                ({ width, height } = (await require('jimp').read(buffer)).bitmap);
+                                const dimension = require(packageName = 'probe-image-size').sync(buffer);
+                                if (!dimension) {
+                                    throw new Error("MIME not found" /* ERR_MESSAGE.NOTFOUND_MIME */);
+                                }
+                                ({ width, height } = dimension);
                             }
                             catch {
-                                const filename = item.localUri || item.filename;
-                                if (filename) {
-                                    this.addLog(types_1.STATUS_TYPE.WARN, `Could not detect image size (${path.basename(filename)})`);
+                                try {
+                                    ({ width, height } = (await require('jimp').read(buffer)).bitmap);
+                                }
+                                catch {
                                 }
+                                packageName = '';
                             }
                         }
                     }
                     if (detectWidth) {
-                        if (width > 0) {
+                        if (width) {
                             domElement.setAttribute('width', width.toString());
                         }
                         else {
                             domElement.removeAttribute('width');
+                            addLog('width');
                         }
                     }
                     if (detectHeight) {
-                        if (height > 0) {
+                        if (height) {
                             domElement.setAttribute('height', height.toString());
                         }
                         else {
                             domElement.removeAttribute('height');
+                            addLog('height');
                         }
                     }
                 }
@@ -2425,6 +2428,7 @@ class ChromeDocument extends Document {
                         }
                         break;
                     }
+                    case 'json':
                     case 'uri':
                     case 'local':
                     case 'export':
@@ -2489,11 +2493,20 @@ class ChromeDocument extends Document {
                                 return [];
                             });
                             break;
+                        case 'json':
+                            if ((result[0] = checkObject(current, current.items)) === null) {
+                                this.abort(type);
+                                errorRemove(current, errorDataSource("Invalid parameters" /* ERR_MESSAGE.PARAMETERS */ + ' (items)', type));
+                                return;
+                            }
+                            if (this.settingsOf(type, 'coerce') === true) {
+                                (0, types_1.coerceObject)(result[0]);
+                            }
+                            break;
                         case 'uri':
                         case 'local': {
                             const { ignoreCache, encoding = 'utf-8', options } = current;
                             let content, target, data, cacheKey;
-                            const addDownload = () => typeof content === 'string' && host.addDownload(Buffer.byteLength(content, encoding));
                             if (type === 'local') {
                                 let location;
                                 ({ pathname: target } = current);
@@ -2509,7 +2522,6 @@ class ChromeDocument extends Document {
                                             try {
                                                 content = fs.readFileSync(location, encoding);
                                                 cacheKey = location;
-                                                addDownload();
                                             }
                                             catch (err) {
                                                 this.abort(type);
@@ -2532,7 +2544,22 @@ class ChromeDocument extends Document {
                                 return;
                             }
                             else if (Document.isURL(target, 'file')) {
-                                if (!ignoreCache && CACHE_DBRESULT.has(target)) {
+                                let { format, contentType, body } = current;
+                                if (body) {
+                                    if (!format && !contentType && (0, types_1.isPlainObject)(body)) {
+                                        format = 'json';
+                                    }
+                                    try {
+                                        content = await host.Request.post(target, body, { format, encoding, contentType });
+                                    }
+                                    catch (err) {
+                                        this.abort(type);
+                                        this.writeFail(["Unable to download file" /* ERR_MESSAGE.DOWNLOAD_FILE */, target], err, { type: 1024 /* LOG_TYPE.HTTP */, startTime });
+                                        errorRemove(current);
+                                        return;
+                                    }
+                                }
+                                else if (!ignoreCache && CACHE_DBRESULT.has(target)) {
                                     data = getCacheItem(CACHE_DBRESULT, target);
                                 }
                                 else {
@@ -2541,10 +2568,7 @@ class ChromeDocument extends Document {
                                     }
                                     if (!(data = cacheData[target])) {
                                         try {
-                                            content = await host.fetchBuffer(target, { encoding });
-                                            if (Buffer.isBuffer(content)) {
-                                                content = content.toString('utf-8');
-                                            }
+                                            content = await host.Request.get(target, { format, encoding });
                                             cacheKey = target;
                                         }
                                         catch (err) {
@@ -2574,7 +2598,6 @@ class ChromeDocument extends Document {
                                         try {
                                             content = fs.readFileSync(pathname, encoding);
                                             cacheKey = pathname;
-                                            addDownload();
                                         }
                                         catch (err) {
                                             this.abort(type);
@@ -2585,6 +2608,9 @@ class ChromeDocument extends Document {
                                     }
                                 }
                             }
+                            if (Buffer.isBuffer(content)) {
+                                content = content.toString('utf-8');
+                            }
                             if ((0, types_1.isString)(content)) {
                                 const { format = path.extname(target).substring(1) } = current;
                                 try {
@@ -2596,15 +2622,19 @@ class ChromeDocument extends Document {
                                     errorRemove(current);
                                     return;
                                 }
-                                if (data && cacheKey) {
-                                    setCacheData.call(this, current, data, cacheKey, cacheData);
-                                }
+                                host.addDownload(Buffer.byteLength(content, encoding));
+                            }
+                            else if (content) {
+                                data = content;
                             }
                             if (!data) {
                                 this.abort(type);
                                 errorRemove(current, errorDataSource(content !== null ? 'Invalid response' : 'Empty response', target));
                                 return;
                             }
+                            if (cacheKey) {
+                                setCacheData.call(this, current, data, cacheKey, cacheData);
+                            }
                             if ((result[0] = checkObject(current, data)) === null) {
                                 this.abort(type);
                                 errorRemove(current, errorDataSource('Invalid ' + (current.query ? 'query' : 'URI'), target));
@@ -2975,6 +3005,13 @@ class ChromeDocument extends Document {
                                             if (preRender) {
                                                 await checkValue(preRender);
                                             }
+                                            const { leadingText, trailingText } = item;
+                                            if (leadingText) {
+                                                value = leadingText + value;
+                                            }
+                                            if (trailingText) {
+                                                value += trailingText;
+                                            }
                                             domElement.innerXml = domBase.initOpts.normalize ? dom_1.DomWriter.normalize(value, { newline: domBase.newline, escapeEntities: domBase.initOpts.escapeEntities }) : value;
                                         }
                                         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/chrome",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Chrome document constructor for E-mc.",
   "main": "index.js",
   "publishConfig": {
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/pi-r.git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
     "directory": "src/module/chrome"
   },
   "keywords": [
@@ -20,9 +20,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.8.2",
-    "@e-mc/core": "^0.8.2",
-    "@e-mc/document": "^0.8.2",
-    "@e-mc/types": "^0.8.2"
+    "@e-mc/cloud": "^0.8.4",
+    "@e-mc/core": "^0.8.4",
+    "@e-mc/document": "^0.8.4",
+    "@e-mc/types": "^0.8.4"
   }
 }

package/types/index.d.ts

@@ -26,6 +26,7 @@ interface DocumentDirectory extends IDocumentDirectory {
 }
 
 interface DocumentComponentExtended<T> extends DbSourceDataType<T> {
+    json?: T;
     uri?: T;
     local?: T;
     export?: T;

package/types/squared.d.ts

@@ -3,6 +3,7 @@ import type { AttributeAction, ConditionProperty, CssConditionData, ElementActio
 import type { UploadAction } from '@e-mc/types/lib/cloud';
 import type { CascadeAction, DbSource } from '@e-mc/types/lib/db';
 import type { RequestData as IRequestData } from '@e-mc/types/lib/node';
+import type { BufferFormat } from '@e-mc/types/lib/request';
 
 interface ImportFrom {
     placeholder: string;
@@ -13,7 +14,7 @@ interface ImportFrom {
 }
 
 interface DataObject extends CascadeAction {
-    format?: string;
+    format?: BufferFormat;
     options?: PlainObject;
 }
 
@@ -86,7 +87,7 @@ export interface UnusedAtRule {
 }
 
 export interface DataSource<T = string> extends IDataSource<T>, ElementAction {
-    source: "cloud" | "uri" | "local" | "export" | DbSource;
+    source: "cloud" | "json" | "uri" | "local" | "export" | DbSource;
     element?: XmlTagNode;
     type?: "text" | "attribute" | "display";
     dynamic?: boolean;
@@ -96,8 +97,16 @@ export interface DataSource<T = string> extends IDataSource<T>, ElementAction {
     ignoreEmpty?: boolean;
 }
 
+export interface TextDataSource extends DataSource {
+    type: "text";
+    leadingText?: string;
+    trailingText?: string;
+}
+
 export interface UriDataSource extends DataSource, DataObject {
     source: "uri";
+    body?: unknown;
+    contentType?: string;
 }
 
 export interface LocalDataSource extends DataSource, DataObject {
@@ -105,6 +114,11 @@ export interface LocalDataSource extends DataSource, DataObject {
     pathname?: string;
 }
 
+export interface JSONDataSource extends DataSource, CascadeAction {
+    source: "json";
+    items?: unknown;
+}
+
 export interface ExportDataSource extends DataSource, CascadeAction {
     source: "export";
     execute?: FunctionType;