mushroom-cli 1.2.8 → 2.0.0-alpha.1

package/dist/docs/docs.v2.js

@@ -213,10 +213,14 @@ function formatModel(obj, strIndent, options) {
 
   var result = '';
   var nextIndent = strIndent + '    ';
-  for (var m in obj) {
+  var keys = Object.keys(obj);
+  var lastIndex = keys.length - 1;
+  for (var i = 0; i <= lastIndex; i++) {
+    var m = keys[i];
     if (!obj.hasOwnProperty(m)) continue;
 
     var child = obj[m];
+    var comma = i < lastIndex ? ',' : '';
 
     var validation = !options.optionalToAll && child.validation && child.validation.required ? 'required' : 'optional';
     if (child.type === 'IdRef' && child.reference) {
@@ -246,7 +250,7 @@ function formatModel(obj, strIndent, options) {
     if (options.mode === 'model') {
       if (child.type === 'object')
         result +=
-          '\r\n' + nextIndent + '"' + m + '": ' + comment + formatModel(child.fields, nextIndent, options) + ',';
+          '\r\n' + nextIndent + '"' + m + '": ' + comment + formatModel(child.fields, nextIndent, options) + comma;
       else if (child.type === 'array') {
         result += `\r\n${nextIndent}"${m}": [`;
         if (child.items.type === 'object')
@@ -269,33 +273,33 @@ function formatModel(obj, strIndent, options) {
             ' ' +
             comment +
             `\r\n${nextIndent}`;
-        result += '],';
+        result += ']' + comma;
       } else if (child.type === 'datetime')
         result +=
-          `\r\n${nextIndent}"${m}": ` + JSON.stringify(child.defaultValue || 'ISODate_ISO_8601') + ', ' + comment;
+          `\r\n${nextIndent}"${m}": ` + JSON.stringify(child.defaultValue || 'ISODate_ISO_8601') + comma + ' ' + comment;
       else if (child.type === 'boolean')
-        result += `\r\n${nextIndent}"${m}": ` + (child.defaultValue || 'false') + ', ' + comment;
+        result += `\r\n${nextIndent}"${m}": ` + (child.defaultValue || 'false') + comma + ' ' + comment;
       else if (child.type === 'integer' || child.type === 'long' || child.type === 'double')
-        result += `\r\n${nextIndent}"${m}": ` + (child.defaultValue || '0') + ', ' + comment;
-      else result += `\r\n${nextIndent}"${m}": ` + JSON.stringify(child.defaultValue || child.type) + ', ' + comment;
+        result += `\r\n${nextIndent}"${m}": ` + (child.defaultValue || '0') + comma + ' ' + comment;
+      else result += `\r\n${nextIndent}"${m}": ` + JSON.stringify(child.defaultValue || child.type) + comma + ' ' + comment;
     } else if (options.mode === 'model_null') {
       if (child.type === 'object')
-        result += '\r\n' + nextIndent + '"' + m + '": ' + comment + formatModel(child.fields, nextIndent, options) + ',';
+        result += '\r\n' + nextIndent + '"' + m + '": ' + comment + formatModel(child.fields, nextIndent, options) + comma;
       else if (child.type === 'array') {
         result += `\r\n${nextIndent}"${m}": [`;
         if (child.items.type === 'object')
-          result += ' ' + comment + formatModel(child.items.fields, nextIndent, options) + '],';
-        else result += '], ' + comment;
-      } else result += `\r\n${nextIndent}"${m}": null, ${comment}`;
+          result += ' ' + comment + formatModel(child.items.fields, nextIndent, options) + ']' + comma;
+        else result += ']' + comma + ' ' + comment;
+      } else result += `\r\n${nextIndent}"${m}": null${comma} ${comment}`;
     } else if (options.mode === 'model_undefined') {
       if (child.type === 'object')
-        result += '\r\n' + nextIndent + '"' + m + '": ' + comment + formatModel(child.fields, nextIndent, options) + ',';
+        result += '\r\n' + nextIndent + '"' + m + '": ' + comment + formatModel(child.fields, nextIndent, options) + comma;
       else if (child.type === 'array') {
         result += `\r\n${nextIndent}"${m}": [`;
         if (child.items.type === 'object')
-          result += ' ' + comment + formatModel(child.items.fields, nextIndent, options) + '], ';
-        else result += '], ' + comment;
-      } else result += `\r\n${nextIndent}"${m}": undefined, ${comment}`;
+          result += ' ' + comment + formatModel(child.items.fields, nextIndent, options) + ']' + comma + ' ';
+        else result += ']' + comma + ' ' + comment;
+      } else result += `\r\n${nextIndent}"${m}": undefined${comma} ${comment}`;
     } else {
       const fieldIdx = 'f_' + __field_idx.toString(36);
       __field_idx++;
@@ -304,7 +308,7 @@ function formatModel(obj, strIndent, options) {
       if (child.type === 'object') result += ' ' + comment + '<span id="' + fieldIdx + '">' + formatModel(child.fields, strIndent + '    ', options) + '</span>';
       else if (child.type === 'array' && child.items.type === 'object')
         result += ' ' + comment + '<span id="' + fieldIdx + '">' + formatModel(child.items.fields, strIndent + '    ', options) + '</span>';
-      else result += ', ' + comment;
+      else result += ' ' + comment;
     }
   }
 
@@ -368,10 +372,14 @@ function formatHintModel(obj, strIndent, options) {
 
   var result = '';
   var nextIndent = strIndent + '    ';
-  for (var m in obj) {
+  var keys = Object.keys(obj);
+  var lastIndex = keys.length - 1;
+  for (var i = 0; i <= lastIndex; i++) {
+    var m = keys[i];
     if (!obj.hasOwnProperty(m)) continue;
 
     var child = obj[m];
+    var comma = i < lastIndex ? ',' : '';
 
     var validation = !options.optionalToAll && child.required ? 'required' : 'optional';
     if (child.type === 'IdRef' && child.reference) {
@@ -395,7 +403,7 @@ function formatHintModel(obj, strIndent, options) {
     if (options.mode === 'model') {
       if (child.type === 'object')
         result +=
-          '\r\n' + nextIndent + '"' + m + '": ' + comment + formatHintModel(child.fields, nextIndent, options) + ',';
+          '\r\n' + nextIndent + '"' + m + '": ' + comment + formatHintModel(child.fields, nextIndent, options) + comma;
       else if (child.type === 'array') {
         result += `\r\n${nextIndent}"${m}": [`;
         if (child.items.type === 'object')
@@ -418,40 +426,40 @@ function formatHintModel(obj, strIndent, options) {
             ' ' +
             comment +
             `\r\n${nextIndent}`;
-        result += '],';
+        result += ']' + comma;
       } else if (child.type === 'datetime')
         result +=
-          `\r\n${nextIndent}"${m}": ` + JSON.stringify(child.defaultValue || 'ISODate_ISO_8601') + ', ' + comment;
+          `\r\n${nextIndent}"${m}": ` + JSON.stringify(child.defaultValue || 'ISODate_ISO_8601') + comma + ' ' + comment;
       else if (child.type === 'boolean')
-        result += `\r\n${nextIndent}"${m}": ` + (child.defaultValue || 'false') + ', ' + comment;
+        result += `\r\n${nextIndent}"${m}": ` + (child.defaultValue || 'false') + comma + ' ' + comment;
       else if (child.type === 'integer' || child.type === 'long' || child.type === 'double')
-        result += `\r\n${nextIndent}"${m}": ` + (child.defaultValue || '0') + ', ' + comment;
-      else result += `\r\n${nextIndent}"${m}": ` + JSON.stringify(child.defaultValue || child.type) + ', ' + comment;
+        result += `\r\n${nextIndent}"${m}": ` + (child.defaultValue || '0') + comma + ' ' + comment;
+      else result += `\r\n${nextIndent}"${m}": ` + JSON.stringify(child.defaultValue || child.type) + comma + ' ' + comment;
     } else if (options.mode === 'model_null') {
       if (child.type === 'object')
-        result += '\r\n' + nextIndent + '"' + m + '": ' + comment + formatHintModel(child.fields, nextIndent, options) + ',';
+        result += '\r\n' + nextIndent + '"' + m + '": ' + comment + formatHintModel(child.fields, nextIndent, options) + comma;
       else if (child.type === 'array') {
         result += `\r\n${nextIndent}"${m}": [`;
         if (child.items.type === 'object')
-          result += ' ' + comment + formatHintModel(child.items.fields, nextIndent, options) + '],';
-        else result += '], ' + comment;
-      } else result += `\r\n${nextIndent}"${m}": null, ${comment}`;
+          result += ' ' + comment + formatHintModel(child.items.fields, nextIndent, options) + ']' + comma;
+        else result += ']' + comma + ' ' + comment;
+      } else result += `\r\n${nextIndent}"${m}": null${comma} ${comment}`;
     } else if (options.mode === 'model_undefined') {
       if (child.type === 'object')
-        result += '\r\n' + nextIndent + '"' + m + '": ' + comment + formatHintModel(child.fields, nextIndent, options) + ",";
+        result += '\r\n' + nextIndent + '"' + m + '": ' + comment + formatHintModel(child.fields, nextIndent, options) + comma;
       else if (child.type === 'array') {
         result += `\r\n${nextIndent}"${m}": [`;
         if (child.items.type === 'object')
-          result += ' ' + comment + formatHintModel(child.items.fields, nextIndent, options) + '], ';
-        else result += '], ' + comment;
-      } else result += `\r\n${nextIndent}"${m}": undefined, ${comment}`;
+          result += ' ' + comment + formatHintModel(child.items.fields, nextIndent, options) + ']' + comma + ' ';
+        else result += ']' + comma + ' ' + comment;
+      } else result += `\r\n${nextIndent}"${m}": undefined${comma} ${comment}`;
     } else {
       result += '\r\n' + strIndent + encodeHtml(m) + ': ' + encodeHtml(child.type);
       if (child.type === 'array') result += child.items.type === 'object' ? ' of object' : ' of ' + child.items.type;
       if (child.type === 'object') result += ' ' + comment + formatHintModel(child.fields, strIndent + '    ', options);
       else if (child.type === 'array' && child.items.type === 'object')
         result += ' ' + comment + formatHintModel(child.items.fields, strIndent + '    ', options);
-      else result += ', ' + comment;
+      else result += ' ' + comment;
     }
   }
 
@@ -780,7 +788,6 @@ function renderEntityActionRolePage(entityName, actionName, grant) {
   };
   tabPage.innerHTML =
     renderTemplate(template, data) + renderTemplate('template-project-entity-action-page-codeSnippets', data);
-  initDom(tabPage);
   if (!action.deny) tabPage.querySelector('.deny-roles')?.remove();
 
   if (!action.matches || !Array.isArray(action.matches) || !action.matches.length)
@@ -798,6 +805,7 @@ function renderEntityActionRolePage(entityName, actionName, grant) {
     tabPage.querySelector('.description')?.remove();
   }
   callback(args);
+  initDom(tabPage);
 }
 
 function renderFindMany(args) {
@@ -1925,23 +1933,32 @@ function doCopy(e) {
   const copyDom = this.parentNode.querySelector(this.dataset.copy);
 
   if (window.ClipboardItem) {
-    const content = copyDom.innerText;
+    const content = getVisibleText(copyDom);
     const blob = new Blob([content], { type: 'text/plain' });
     const text = new ClipboardItem({ 'text/plain': blob });
     navigator.clipboard.write([text]);
   } else {
-    if (document.body.createTextRange) {
-      const range = document.body.createTextRange();
-      range.moveToElementText(copyDom);
-      range.select();
-    } else if (window.getSelection) {
-      const selection = window.getSelection();
-      const range = document.createRange();
-      range.selectNodeContents(copyDom);
-      selection.removeAllRanges();
-      selection.addRange(range);
+    const clone = cloneVisible(copyDom);
+    copyDom.parentNode.insertBefore(clone, copyDom);
+    const savedDisplay = copyDom.style.display;
+    copyDom.style.display = 'none';
+    try {
+      if (document.body.createTextRange) {
+        const range = document.body.createTextRange();
+        range.moveToElementText(clone);
+        range.select();
+      } else if (window.getSelection) {
+        const selection = window.getSelection();
+        const range = document.createRange();
+        range.selectNodeContents(clone);
+        selection.removeAllRanges();
+        selection.addRange(range);
+      }
+      document.execCommand('copy');
+    } finally {
+      clone.remove();
+      copyDom.style.display = savedDisplay;
     }
-    document.execCommand('copy');
   }
 
   copied();
@@ -1955,14 +1972,47 @@ function copied() {
   setTimeout(() => dom.classList.remove('show'), 1000);
 }
 
+function getVisibleText(element) {
+  const clone = element.cloneNode(true);
+  // Walk all elements in the clone; remove those that are hidden in the original DOM
+  const originalAll = element.querySelectorAll('*');
+  const cloneAll = clone.querySelectorAll('*');
+  for (let i = cloneAll.length - 1; i >= 0; i--) {
+    const style = window.getComputedStyle(originalAll[i]);
+    if (style.display === 'none' || style.visibility === 'hidden') {
+      cloneAll[i].remove();
+    }
+  }
+  return clone.textContent || '';
+}
+
+function cloneVisible(element) {
+  const clone = element.cloneNode(true);
+  const originalAll = element.querySelectorAll('*');
+  const cloneAll = clone.querySelectorAll('*');
+  for (let i = cloneAll.length - 1; i >= 0; i--) {
+    const style = window.getComputedStyle(originalAll[i]);
+    if (style.display === 'none' || style.visibility === 'hidden') {
+      cloneAll[i].remove();
+    }
+  }
+  return clone;
+}
+
 function initDom(dom) {
   $('pre[data-language]', dom).each(function () {
-    const holder = document.createElement('div');
-    holder.className = 'command-bar';
+    let holder = this.querySelector(":scope > .command-bar");
+    if (!holder) {
+      holder = document.createElement('div');
+      holder.className = 'command-bar';
+      $(this).prepend(holder);
+    }
+    
+    if (holder.querySelector(":scope > .command-item-copy")) return;
     const copyButton = document.createElement('a');
+    copyButton.className = 'command-item-copy';
     copyButton.innerHTML = 'Copy';
     holder.appendChild(copyButton);
-    $(this).prepend(holder);
     copyButton.onclick = function () {
       if (location.protocol !== 'https:' && location.protocol !== 'file:') {
         alert('Can not copy, please use https protocol!');
@@ -1972,23 +2022,32 @@ function initDom(dom) {
       const commandBar = $(this).parent().detach();
       try {
         if (window.ClipboardItem) {
-          const content = pre.text();
+          const content = getVisibleText(pre[0]);
           const blob = new Blob([content], { type: 'text/plain' });
           const text = new ClipboardItem({ 'text/plain': blob });
           navigator.clipboard.write([text]);
         } else {
-          if (document.body.createTextRange) {
-            const range = document.body.createTextRange();
-            range.moveToElementText(pre[0]);
-            range.select();
-          } else if (window.getSelection) {
-            const selection = window.getSelection();
-            const range = document.createRange();
-            range.selectNodeContents(pre[0]);
-            selection.removeAllRanges();
-            selection.addRange(range);
+          const clone = cloneVisible(pre[0]);
+          pre[0].parentNode.insertBefore(clone, pre[0]);
+          const savedDisplay = pre[0].style.display;
+          pre[0].style.display = 'none';
+          try {
+            if (document.body.createTextRange) {
+              const range = document.body.createTextRange();
+              range.moveToElementText(clone);
+              range.select();
+            } else if (window.getSelection) {
+              const selection = window.getSelection();
+              const range = document.createRange();
+              range.selectNodeContents(clone);
+              selection.removeAllRanges();
+              selection.addRange(range);
+            }
+            document.execCommand('copy');
+          } finally {
+            clone.remove();
+            pre[0].style.display = savedDisplay;
           }
-          document.execCommand('copy');
         }
       } finally {
         pre.prepend(commandBar);
@@ -1998,8 +2057,10 @@ function initDom(dom) {
     };
   });
 
-  $('pre[data-language=json] .command-bar', dom).each(function () {
+  $('pre[data-language=json] .command-bar, pre[data-language=object-spec] .command-bar', dom).each(function () {
+    if (this.querySelector(":scope > .command-item-copy-without-comment")) return;
     const copyButton = document.createElement('a');
+    copyButton.className = 'command-item-copy-without-comment';
     copyButton.innerHTML = 'Copy (without comment)';
     $(this).prepend(copyButton);
     copyButton.onclick = function () {
@@ -2015,23 +2076,32 @@ function initDom(dom) {
       });
       try {
         if (window.ClipboardItem) {
-          const content = pre.text();
+          const content = getVisibleText(pre[0]);
           const blob = new Blob([content], { type: 'text/plain' });
           const text = new ClipboardItem({ 'text/plain': blob });
           navigator.clipboard.write([text]);
         } else {
-          if (document.body.createTextRange) {
-            const range = document.body.createTextRange();
-            range.moveToElementText(pre[0]);
-            range.select();
-          } else if (window.getSelection) {
-            const selection = window.getSelection();
-            const range = document.createRange();
-            range.selectNodeContents(pre[0]);
-            selection.removeAllRanges();
-            selection.addRange(range);
+          const clone = cloneVisible(pre[0]);
+          pre[0].parentNode.insertBefore(clone, pre[0]);
+          const savedDisplay = pre[0].style.display;
+          pre[0].style.display = 'none';
+          try {
+            if (document.body.createTextRange) {
+              const range = document.body.createTextRange();
+              range.moveToElementText(clone);
+              range.select();
+            } else if (window.getSelection) {
+              const selection = window.getSelection();
+              const range = document.createRange();
+              range.selectNodeContents(clone);
+              selection.removeAllRanges();
+              selection.addRange(range);
+            }
+            document.execCommand('copy');
+          } finally {
+            clone.remove();
+            pre[0].style.display = savedDisplay;
           }
-          document.execCommand('copy');
         }
       } finally {
         pre.prepend(commandBar);

package/dist/gen/csharp/extEvents.js

@@ -0,0 +1,195 @@
+const extEvents = {
+    auth: {
+        'Events.Login.Before': {
+            type: 'Before',
+        },
+        'Events.Login.Validate.Before': {
+            type: 'Before',
+        },
+        'Events.Login.Validate.After': {
+            type: 'After',
+        },
+        'Events.Login.CheckLocking.Before': {
+            type: 'Before',
+        },
+        'Events.Login.CheckLocking.After': {
+            type: 'After',
+            data: 'Mushroom.Extensions.DefaultAuth.UserLock',
+        },
+        CustomLoginAsyncFunc: {
+            type: 'Func',
+            registerFunc: 'RegisterCustomLoginAsyncHandler',
+        },
+        'Events.Login.LogAuth.Before': {
+            type: 'Before',
+        },
+        GetAuthLogInfoAsyncFunc: {
+            type: 'Func',
+            registerFunc: 'RegisterGetAuthLogInfoAsyncHandler',
+        },
+        'Events.Login.LogAuth.After': {
+            type: 'After',
+            data: 'Mushroom.Extensions.DefaultAuth.UserAuthLogResult',
+        },
+        'Events.Login.LoginFail': {
+            type: 'After',
+        },
+        'Events.Login.LoginSuccess': {
+            type: 'Event',
+            registerFunc: 'RegisterLoginSuccessHandler',
+        },
+        'Events.Login.After': {
+            type: 'After',
+            data: 'string',
+        },
+        'Events.Logout.Before': {
+            type: 'Before',
+        },
+        'Events.Logout.After': {
+            type: 'After',
+            data: 'bool',
+        },
+        'Events.Status.Before': {
+            type: 'Before',
+        },
+        'Events.Status.After': {
+            type: 'After',
+            data: 'bool',
+        },
+        'Events.Me.Before': {
+            type: 'Before',
+        },
+        'Events.Me.After': {
+            type: 'After',
+            data: 'Mushroom.Extensions.DefaultAuth.User',
+        },
+        'Events.Register.Before': {
+            type: 'Before',
+        },
+        SendCodeItemFunc: {
+            type: 'Func',
+            registerFunc: 'RegisterSendCodeItemHandler',
+        },
+        'Events.Register.After': {
+            type: 'After',
+            data: 'Mushroom.Extensions.DefaultAuth.User',
+        },
+        'Events.Activate.Before': {
+            type: 'Before',
+        },
+        'Events.Activate.After': {
+            type: 'After',
+            data: 'Mushroom.Extensions.DefaultAuth.User',
+        },
+        'Events.RecoverPassword.Before': {
+            type: 'Before',
+        },
+        'Events.RecoverPassword.After': {
+            type: 'After',
+            data: 'Mushroom.Extensions.DefaultAuth.User',
+        },
+        'Events.ResetPassword.Before': {
+            type: 'Before',
+        },
+        'Events.ResetPassword.After': {
+            type: 'After',
+            data: 'Mushroom.Extensions.DefaultAuth.User',
+        },
+    },
+    file: {
+        'Events.Upload.Before': {
+            type: 'Before',
+        },
+        'Events.Upload.After': {
+            type: 'After',
+        },
+        'Events.Thumb.Before': {
+            type: 'Before',
+        },
+        'Events.Thumb.After': {
+            type: 'After',
+        },
+        'Events.Download.Before': {
+            type: 'Before',
+        },
+        'Events.Download.After': {
+            type: 'After',
+        },
+        'Events.Zip.Before': {
+            type: 'Before',
+        },
+        'Events.Zip.After': {
+            type: 'After',
+        },
+        LimitFileUploadSizeFunc: {
+            type: 'Func',
+            data: 'System.Threading.Tasks.Task<long?>',
+        },
+    },
+    mail: {
+        AuthorizationFunc: {
+            type: 'Func',
+            data: 'System.Threading.Tasks.Task<bool>, Mushroom.Extensions.Mailing.MailingAuthorizationArgument',
+        },
+    },
+};
+export const getExtensionEventsCode = (source, newLine) => {
+    const eventCodes = [];
+    const addEventCodes = (key, code, source) => {
+        const eventCode = eventCodes.find((ec) => ec.key === key);
+        if (eventCode) {
+            eventCode.source.push(source);
+            return;
+        }
+        eventCodes.push({
+            key,
+            code,
+            source: [source],
+        });
+    };
+    Object.keys(extEvents).forEach((ext) => {
+        const extension = source.extensions?.[ext];
+        if (!extension?.config)
+            return;
+        const config = extension.config;
+        Object.keys(extEvents[ext]).forEach((configName) => {
+            const def = extEvents[ext][configName];
+            const configValue = config[configName];
+            if (!configValue || typeof configValue !== 'string' || !configValue.startsWith('lib:'))
+                return;
+            if (def.type == 'Func') {
+                const defaultFunc = `RegisterCustomMethod<${def.data || 'System.Threading.Tasks.Task'}>`;
+                addEventCodes(ext + '.' + configName, `${def.registerFunc || defaultFunc}(${configValue.substring(4)});`, `extension: ${ext} - config: ${configName}`);
+                return;
+            }
+            if (def.type == 'Event') {
+                configValue.split(',').forEach((lib) => {
+                    if (!lib || !lib.startsWith('lib:'))
+                        return;
+                    addEventCodes(ext + '.' + configName, `${def.registerFunc || 'RegisterEvent'}(${lib.substring(4)});`, `extension: ${ext} - config: ${configName}`);
+                });
+                return;
+            }
+            if (def.type == 'Before') {
+                configValue.split(',').forEach((lib) => {
+                    if (!lib || !lib.startsWith('lib:'))
+                        return;
+                    addEventCodes(ext + '.' + configName, `${def.registerFunc || 'RegisterBeforeEvent'}(${lib.substring(4)});`, `extension: ${ext} - config: ${configName}`);
+                });
+                return;
+            }
+            if (def.type == 'After') {
+                configValue.split(',').forEach((lib) => {
+                    if (!lib || !lib.startsWith('lib:'))
+                        return;
+                    addEventCodes(ext + '.' + configName, `${def.registerFunc || (def.data ? `RegisterAfterEvent<${def.data}>` : 'RegisterAfterEvent')}(${lib.substring(4)});`, `extension: ${ext} - config: ${configName}`);
+                });
+                return;
+            }
+            return '';
+        });
+    });
+    return eventCodes
+        .map((ec) => `${ec.source.map((s) => '            // ' + s).join(newLine)}${newLine}            ${ec.code}`)
+        .join(newLine);
+};