feat: publish @alilc/lowcode-material-parser@1.0.4-beta.0

modules/material-parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alilc/lowcode-material-parser",
-  "version": "1.0.3",
+  "version": "1.0.4-beta.0",
   "description": "material parser for Ali lowCode engine",
   "main": "lib/index.js",
   "files": [

modules/material-parser/src/parse/transform.ts

@@ -1,4 +1,4 @@
-import { omit, pick, isNil, uniq } from 'lodash';
+import { omit, pick, isNil, uniq, pull } from 'lodash';
 import { safeEval, isEvaluable } from '../utils';
 import { debug } from '../core';
 
@@ -38,6 +38,7 @@ export function transformType(itemType: any) {
     case 'element':
     case 'node':
     case 'void':
+    case 'undefined':
       break;
     case 'func':
       if (params) {
@@ -205,6 +206,7 @@ function combineOneOfValues(propType) {
   const newValue = [];
   let oneOfItem = null;
   let firstBooleanIndex = -1;
+
   propType.value.forEach((item) => {
     if (item?.type === 'oneOf') {
       if (!oneOfItem) {
@@ -228,7 +230,14 @@ function combineOneOfValues(propType) {
       newValue.push(item);
     }
   });
+
   let result = propType;
+
+  if (!result.isRequired && result.value.includes('undefined')) {
+    pull(result.value, 'undefined');
+    pull(newValue, 'undefined');
+  }
+
   const oneOfItemLength = oneOfItem?.value?.length;
   if (oneOfItemLength) {
     newValue.push(oneOfItem);
@@ -247,6 +256,11 @@ function combineOneOfValues(propType) {
     };
   }
   result.value = uniq(result.value);
+
+  if (result.type === 'oneOfType' && result.value.length === 1) {
+    result = result.value[0];
+  }
+
   return result;
 }
 

modules/material-parser/src/parse/ts/index.ts

@@ -294,6 +294,10 @@ function getDocgenTypeHelper(
     return makeResult({
       name: 'any',
     });
+  } else if (type.flags & TypeFlags.Undefined) {
+    return makeResult({
+      name: 'undefined',
+    });
   } else if (type.flags & TypeFlags.Union && !isComplexType(type)) {
     return makeResult({
       name: 'union',

modules/material-parser/test/__snapshots__/index.test.ts.snap

@@ -897,7 +897,7 @@ Array [
     "npm": Object {
       "destructuring": true,
       "exportName": "\\"default\\"",
-      "main": "lib/index.js",
+      "main": "src/index.js",
       "package": "transpiled-component",
       "subName": "",
       "version": "1.0.0",
@@ -1067,6 +1067,7 @@ Array [
         },
       },
       Object {
+        "defaultValue": "str2",
         "name": "str",
         "propType": "string",
       },

modules/material-parser/test/fixtures/transpiled-component/package.json

@@ -1,7 +1,7 @@
 {
     "name": "transpiled-component",
     "version": "1.0.0",
-    "main": "lib/index.js",
+    "main": "src/index.js",
     "dependencies": {
         "react": "^16.0.0"
     }

modules/material-parser/test/fixtures/transpiled-component/src/index.js

@@ -0,0 +1,111 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _next = require("@alifd/next");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+/**
+ * General component description.
+ */
+var MyComponent = /*#__PURE__*/function (_Component) {
+  _inherits(MyComponent, _Component);
+
+  var _super = _createSuper(MyComponent);
+
+  function MyComponent() {
+    _classCallCheck(this, MyComponent);
+
+    return _super.apply(this, arguments);
+  }
+
+  _createClass(MyComponent, [{
+    key: "add",
+
+    /**
+     * adds two numbers.
+     * @constructor
+     * @param {number} x - 1st number.
+     * @param {number} y - 2nd number.
+     */
+    value: function add(x, y) {
+      var ret = x + y;
+      return ret;
+    }
+  }, {
+    key: "render",
+    value: function render() {// ...
+    }
+  }]);
+
+  return MyComponent;
+}(_react.Component);
+
+function AComponent(_ref) {
+  var children = _ref.children;
+  return /*#__PURE__*/_react["default"].createElement("div", null, children);
+}
+
+MyComponent.propTypes = {
+  /**
+   * Description of prop "foo".
+   */
+  foo: _propTypes["default"].number.isRequired,
+
+  /**
+   * Description of prop "bar" (a custom validation function).
+   */
+  bar: function bar(props, propName, componentName) {// ...
+  },
+  baz: _propTypes["default"].oneOfType([_propTypes["default"].number, _propTypes["default"].string]),
+  optionalObjectWithShape2: _propTypes["default"].shape({
+    optionalProperty: _propTypes["default"].string,
+    requiredProperty: _propTypes["default"].number.isRequired
+  }).isRequired // ...Button.propTypes
+
+};
+MyComponent.defaultProps = {
+  bar: 21,
+
+  get foo() {
+    return 1 + 1;
+  }
+
+};
+MyComponent.AComponent = AComponent;
+var _default = MyComponent;
+exports["default"] = _default;