cloudcmd 19.4.0 → 19.5.0

package/common/cloudfunc.js

@@ -1,4 +1,4 @@
-import rendy from 'rendy';
+import {rendy} from 'rendy';
 import currify from 'currify';
 import store from 'fullstore';
 import {encode} from '#common/entity';
@@ -128,7 +128,6 @@ export const buildFromJSON = (params) => {
     const json = params.data;
     
     const path = encode(json.path);
-    
     const {files} = json;
     
     /*

package/common/entity.js

@@ -2,6 +2,8 @@ const Entities = {
     '&lt;': '<',
     '&gt;': '>',
     '&quot;': '"',
+    '&lcub;': '{',
+    '&rcub;': '}',
 };
 
 const keys = Object.keys(Entities);

package/dist/cloudcmd.common.js

@@ -5988,75 +5988,6 @@ Philip.prototype._find = function(entries, fn) {
 };
 
 
-/***/ },
-
-/***/ 6686
-(module) {
-
-"use strict";
-
-
-const isString = (a) => typeof a === 'string';
-const constant = (a) => () => a;
-const {keys} = Object;
-
-module.exports = (template, values, modifiers) => {
-    check(template, values);
-    
-    let result = template;
-    
-    const names = !modifiers ? keys(values) : template.match(/{{(.*?)}}/g);
-    
-    for (const key of names) {
-        const [parsedKey, value] = parseValue(key, values, modifiers);
-        const str = constant(value);
-        
-        while (result.includes(parsedKey))
-            result = result.replace(parsedKey, str);
-    }
-    
-    if (result.includes('{{'))
-        result = result.replace(/{{.*?}}/g, '');
-    
-    return result;
-};
-
-function check(template, values) {
-    if (!isString(template))
-        throw Error('template should be a string!');
-    
-    if (typeof values !== 'object')
-        throw Error('values should be an object!');
-}
-
-function parseValue(key, values, modifiers) {
-    if (!modifiers)
-        return [
-            `{{ ${key} }}`,
-            values[key],
-        ];
-    
-    const preparedKey = key
-        .replaceAll('{{', '')
-        .replaceAll('}}', '')
-        .replaceAll(' ', '');
-    
-    const value = values[preparedKey] || '';
-    
-    if (!preparedKey.includes('|'))
-        return [key, value];
-    
-    const [name, modifierName] = preparedKey.split('|');
-    const fn = modifiers[modifierName];
-    const currentValue = values[name];
-    
-    if (!fn)
-        return [key, currentValue];
-    
-    return [key, fn(currentValue)];
-}
-
-
 /***/ },
 
 /***/ 6727
@@ -6065,7 +5996,7 @@ function parseValue(key, values, modifiers) {
 "use strict";
 
 
-const rendy = __webpack_require__(6686);
+const rendy = __webpack_require__(7442);
 const TEMPLATE = __webpack_require__(4002);
 
 const isObj = (a) => typeof a === 'object';
@@ -6447,6 +6378,75 @@ module.exports.ITEM = '<li data-name="js-menu-item" class="menu-item{{ className
     '</li>';
 
 
+/***/ },
+
+/***/ 7442
+(module) {
+
+"use strict";
+
+
+const isString = (a) => typeof a === 'string';
+const constant = (a) => () => a;
+const {keys} = Object;
+
+module.exports = (template, values, modifiers) => {
+    check(template, values);
+    
+    let result = template;
+    
+    const names = !modifiers ? keys(values) : template.match(/{{(.*?)}}/g);
+    
+    for (const key of names) {
+        const [parsedKey, value] = parseValue(key, values, modifiers);
+        const str = constant(value);
+        
+        while (result.includes(parsedKey))
+            result = result.replace(parsedKey, str);
+    }
+    
+    if (result.includes('{{'))
+        result = result.replace(/{{.*?}}/g, '');
+    
+    return result;
+};
+
+function check(template, values) {
+    if (!isString(template))
+        throw Error('template should be a string!');
+    
+    if (typeof values !== 'object')
+        throw Error('values should be an object!');
+}
+
+function parseValue(key, values, modifiers) {
+    if (!modifiers)
+        return [
+            `{{ ${key} }}`,
+            values[key],
+        ];
+    
+    const preparedKey = key
+        .replaceAll('{{', '')
+        .replaceAll('}}', '')
+        .replaceAll(' ', '');
+    
+    const value = values[preparedKey] || '';
+    
+    if (!preparedKey.includes('|'))
+        return [key, value];
+    
+    const [name, modifierName] = preparedKey.split('|');
+    const fn = modifiers[modifierName];
+    const currentValue = values[name];
+    
+    if (!fn)
+        return [key, currentValue];
+    
+    return [key, fn(currentValue)];
+}
+
+
 /***/ },
 
 /***/ 8530
@@ -6573,7 +6573,7 @@ var emitify = __webpack_require__(7411);
 // EXTERNAL MODULE: ./node_modules/inherits/inherits_browser.js
 var inherits_browser = __webpack_require__(6698);
 // EXTERNAL MODULE: ./node_modules/rendy/lib/rendy.js
-var rendy = __webpack_require__(6686);
+var rendy = __webpack_require__(4492);
 // EXTERNAL MODULE: ./node_modules/format-io/lib/format.js
 var format = __webpack_require__(1730);
 // EXTERNAL MODULE: ./node_modules/just-pascal-case/index.mjs
@@ -7665,7 +7665,7 @@ function CloudCmdProto({
     const position = DOM.getPanelPosition(panel);
     const sort = CloudCmd.sort[position];
     const order = CloudCmd.order[position];
-    const query = rendy('?sort={{ sort }}&order={{ order }}', {
+    const query = (0,rendy/* rendy */.n)('?sort={{ sort }}&order={{ order }}', {
       sort,
       order
     });
@@ -9737,7 +9737,7 @@ var buffer = __webpack_require__(2710);
 // EXTERNAL MODULE: ./node_modules/util/util.js
 var util_util = __webpack_require__(537);
 // EXTERNAL MODULE: ./node_modules/rendy/lib/rendy.js
-var rendy = __webpack_require__(6686);
+var rendy = __webpack_require__(4492);
 // EXTERNAL MODULE: ./node_modules/itype/lib/itype.js
 var itype = __webpack_require__(2515);
 // EXTERNAL MODULE: ./node_modules/load.js/lib/load.js
@@ -9780,7 +9780,7 @@ const loadRemote = (0,util_util.callbackify)(async (name, options) => {
   }
   const localURL = local.map(url => prefix + url);
   const remoteURL = remoteTmpls.map(tmpl => {
-    return rendy(tmpl, {
+    return (0,rendy/* rendy */.n)(tmpl, {
       version
     });
   });
@@ -11236,7 +11236,7 @@ function hide() {}
 // UNUSED EXPORTS: hide, init, show
 
 // EXTERNAL MODULE: ./node_modules/rendy/lib/rendy.js
-var rendy = __webpack_require__(6686);
+var rendy = __webpack_require__(4492);
 // EXTERNAL MODULE: ./node_modules/currify/lib/currify.js
 var currify = __webpack_require__(4299);
 // EXTERNAL MODULE: ./node_modules/wraptile/lib/wraptile.js
@@ -11425,7 +11425,7 @@ async function fillTemplate() {
   obj[`${columns}-selected`] = 'selected';
   obj[`${theme}-selected`] = 'selected';
   obj.configAuth = configAuth ? '' : 'hidden';
-  const innerHTML = rendy(Template, obj);
+  const innerHTML = (0,rendy/* rendy */.n)(Template, obj);
   Element = create_element('form', {
     className: 'config',
     innerHTML
@@ -13860,7 +13860,7 @@ __webpack_require__.d(modal_namespaceObject, {
 });
 
 // EXTERNAL MODULE: ./node_modules/rendy/lib/rendy.js
-var rendy = __webpack_require__(6686);
+var rendy = __webpack_require__(4492);
 // EXTERNAL MODULE: ./node_modules/currify/lib/currify.js
 var currify = __webpack_require__(4299);
 // EXTERNAL MODULE: ./node_modules/wraptile/lib/wraptile.js
@@ -14440,7 +14440,7 @@ async function getMediaElement(src) {
   if (!TemplateAudio) TemplateAudio = template;
   const is = isAudio(name);
   const type = is ? 'audio' : 'video';
-  const innerHTML = rendy(TemplateAudio, {
+  const innerHTML = (0,rendy/* rendy */.n)(TemplateAudio, {
     src,
     type,
     name
@@ -14509,7 +14509,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getPathLink: () => (/* binding */ getPathLink),
 /* harmony export */   getTitle: () => (/* binding */ getTitle)
 /* harmony export */ });
-/* harmony import */ var rendy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(6686);
+if (858 == __webpack_require__.j) {
+	/* harmony import */ var rendy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4492);
+}
 /* harmony import */ var currify__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4299);
 /* harmony import */ var fullstore__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(8328);
 /* harmony import */ var _common_entity__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(634);
@@ -14577,7 +14579,7 @@ function getPathLink(url, prefix, template) {
       continue;
     }
     const slash = i ? '/' : '';
-    lines.push(rendy__WEBPACK_IMPORTED_MODULE_0__(template, {
+    lines.push((0,rendy__WEBPACK_IMPORTED_MODULE_0__/* .rendy */ .n)(template, {
       path,
       name,
       slash,
@@ -14617,7 +14619,7 @@ const buildFromJSON = params => {
    * со всеми подкаталогами
    */
   const htmlPath = getPathLink(path, prefix, template.pathLink);
-  let fileTable = rendy__WEBPACK_IMPORTED_MODULE_0__(template.path, {
+  let fileTable = (0,rendy__WEBPACK_IMPORTED_MODULE_0__/* .rendy */ .n)(template.path, {
     link: prefix + FS + path,
     fullPath: path,
     path: htmlPath
@@ -14628,7 +14630,7 @@ const buildFromJSON = params => {
   const name = getFieldName('name');
   const size = getFieldName('size');
   const date = getFieldName('date');
-  const header = rendy__WEBPACK_IMPORTED_MODULE_0__(templateFile, {
+  const header = (0,rendy__WEBPACK_IMPORTED_MODULE_0__/* .rendy */ .n)(templateFile, {
     tag: 'div',
     attribute: 'data-name="js-fm-header" ',
     className: 'fm-header',
@@ -14648,7 +14650,7 @@ const buildFromJSON = params => {
   if (path !== '/') {
     const dotDot = getDotDot(path);
     const link = prefix + FS + dotDot;
-    const linkResult = rendy__WEBPACK_IMPORTED_MODULE_0__(template.link, {
+    const linkResult = (0,rendy__WEBPACK_IMPORTED_MODULE_0__/* .rendy */ .n)(template.link, {
       link,
       title: '..',
       name: '..'
@@ -14657,7 +14659,7 @@ const buildFromJSON = params => {
     const attribute = `draggable="true" ${dataName}`;
 
     /* Сохраняем путь к каталогу верхнего уровня*/
-    fileTable += rendy__WEBPACK_IMPORTED_MODULE_0__(template.file, {
+    fileTable += (0,rendy__WEBPACK_IMPORTED_MODULE_0__/* .rendy */ .n)(template.file, {
       tag: 'li',
       attribute,
       className: '',
@@ -14681,7 +14683,7 @@ const buildFromJSON = params => {
       owner,
       size
     } = file;
-    const linkResult = rendy__WEBPACK_IMPORTED_MODULE_0__(templateLink, {
+    const linkResult = (0,rendy__WEBPACK_IMPORTED_MODULE_0__/* .rendy */ .n)(templateLink, {
       link,
       title: name,
       name,
@@ -14689,7 +14691,7 @@ const buildFromJSON = params => {
     });
     const dataName = _getDataName(file.name);
     const attribute = `draggable="true" ${dataName}`;
-    return rendy__WEBPACK_IMPORTED_MODULE_0__(templateFile, {
+    return (0,rendy__WEBPACK_IMPORTED_MODULE_0__/* .rendy */ .n)(templateFile, {
       tag: 'li',
       attribute,
       className: '',
@@ -14750,7 +14752,9 @@ function getDotDot(path) {
 const Entities = {
   '&lt;': '<',
   '&gt;': '>',
-  '&quot;': '"'
+  '&quot;': '"',
+  '&lcub;': '{',
+  '&rcub;': '}'
 };
 const keys = Object.keys(Entities);
 const encode = str => {
@@ -14987,6 +14991,75 @@ function pascalCase(str) {
 
 
 
+/***/ },
+
+/***/ 4492
+(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   n: () => (/* binding */ rendy)
+/* harmony export */ });
+const isString = (a) => typeof a === 'string';
+const constant = (a) => () => a;
+const {keys} = Object;
+
+const rendy = (template, values, modifiers) => {
+    check(template, values);
+    
+    let result = template;
+    const names = !modifiers ? keys(values) : template.match(/{{(.*?)}}/g);
+    
+    for (const key of names) {
+        const [parsedKey, value] = parseValue(key, values, modifiers);
+        const str = constant(value);
+        
+        while (result.includes(parsedKey))
+            result = result.replace(parsedKey, str);
+    }
+    
+    if (result.includes('{{'))
+        result = result.replace(/{{.*?}}/g, '');
+    
+    return result;
+};
+
+function check(template, values) {
+    if (!isString(template))
+        throw Error('template should be a string!');
+    
+    if (typeof values !== 'object')
+        throw Error('values should be an object!');
+}
+
+function parseValue(key, values, modifiers) {
+    if (!modifiers)
+        return [
+            `{{ ${key} }}`,
+            values[key],
+        ];
+    
+    const preparedKey = key
+        .replaceAll('{{', '')
+        .replaceAll('}}', '')
+        .replaceAll(' ', '');
+    
+    const value = values[preparedKey] || '';
+    
+    if (!preparedKey.includes('|'))
+        return [key, value];
+    
+    const [name, modifierName] = preparedKey.split('|');
+    const fn = modifiers[modifierName];
+    const currentValue = values[name];
+    
+    if (!fn)
+        return [key, currentValue];
+    
+    return [key, fn(currentValue)];
+}
+
+
 /***/ },
 
 /***/ 980