Merge pull request alibaba#228 from alibaba/feat/lowcode-slot-props

JackLian · web-flow · commit 6b24f9d2ffea · 2022-03-30T14:03:55.000+08:00
fix: Fix the conversion failure of some props expressions under Slot …
diff --git a/packages/react-renderer/jest.config.js b/packages/react-renderer/jest.config.js
@@ -1,15 +1,10 @@
-const esModules = ['@recore/obx-react'].join('|');
-
 module.exports = {
   // transform: {
   //   '^.+\\.[jt]sx?$': 'babel-jest',
   //   // '^.+\\.(ts|tsx)$': 'ts-jest',
   //   // '^.+\\.(js|jsx)$': 'babel-jest',
   // },
   // testMatch: ['(/tests?/.*(test))\\.[jt]s$'],
-  transformIgnorePatterns: [
-    `/node_modules/(?!${esModules})/`,
-  ],
   moduleFileExtensions: ['ts', 'tsx', 'js', 'json'],
   collectCoverage: true,
   collectCoverageFrom: [
diff --git a/packages/renderer-core/jest.config.js b/packages/renderer-core/jest.config.js
@@ -1,5 +1,4 @@
 const esModules = [
-  '@recore/obx-react',
   '@alilc/lowcode-datasource-engine',
 ].join('|');
 
diff --git a/packages/utils/build.test.json b/packages/utils/build.test.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "build-plugin-component",
+    "@alilc/lowcode-test-mate/plugin/index.ts"
+  ]
+}
diff --git a/packages/utils/jest.config.js b/packages/utils/jest.config.js
@@ -0,0 +1,9 @@
+module.exports = {
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'json'],
+  collectCoverage: true,
+  collectCoverageFrom: [
+    'src/**/*.{ts,tsx}',
+    '!**/node_modules/**',
+    '!**/vendor/**',
+  ],
+};
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -9,6 +9,7 @@
   "main": "lib/index.js",
   "module": "es/index.js",
   "scripts": {
+    "test": "build-scripts test --config build.test.json",
     "build": "build-scripts build --skip-demo"
   },
   "dependencies": {
diff --git a/packages/utils/src/schema.ts b/packages/utils/src/schema.ts
@@ -26,7 +26,7 @@ export function compatibleLegaoSchema(props: any): any {
         type: 'JSSlot',
         title: (props.value.props as any)?.slotTitle,
         name: (props.value.props as any)?.slotName,
-        value: props.value.children,
+        value: compatibleLegaoSchema(props.value.children),
         params: (props.value.props as any)?.slotParams,
       };
     } else {
diff --git a/packages/utils/test/src/__snapshots__/schema.test.ts.snap b/packages/utils/test/src/__snapshots__/schema.test.ts.snap
@@ -0,0 +1,23 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Schema Ut props 1`] = `
+Object {
+  "props": Object {
+    "mobileSlot": Object {
+      "name": undefined,
+      "params": undefined,
+      "title": undefined,
+      "type": "JSSlot",
+      "value": Array [
+        Object {
+          "loop": Object {
+            "mock": undefined,
+            "type": "JSExpression",
+            "value": "props.content",
+          },
+        },
+      ],
+    },
+  },
+}
+`;
diff --git a/packages/utils/test/src/schema.test.ts b/packages/utils/test/src/schema.test.ts
@@ -0,0 +1,27 @@
+import { compatibleLegaoSchema } from '../../src/schema';
+describe('Schema Ut', () => {
+  it('props', () => {
+    const schema = {
+      props: {
+        mobileSlot: {
+          type: "JSBlock",
+          value: {
+            componentName: "Slot",
+            children: [
+              {
+                loop: {
+                  variable: "props.content",
+                  type: "variable"
+                },
+              }
+            ],
+          }
+        },
+      },
+  };
+
+    const result = compatibleLegaoSchema(schema);
+    expect(result).toMatchSnapshot();
+    expect(result.props.mobileSlot.value[0].loop.type).toBe('JSExpression');
+  });
+})

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`const esModules = [`
`2`		`- '@recore/obx-react',`
`3`	`2`	`'@alilc/lowcode-datasource-engine',`
`4`	`3`	`].join('\|');`
`5`	`4`