From 9cb4f0bd791edf3a55ffa99c7a6cf651dad56b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LeoYuan=20=E8=A2=81=E5=8A=9B=E7=9A=93?= Date: Wed, 14 Dec 2022 14:21:55 +0800 Subject: [PATCH] chore: update UT snapshots of CodeGenerator --- .../tests/bugfix/i18n-with-params.test.ts | 2 +- .../bugfix/icejs-import-wrong-naming.test.ts | 28 +- .../bugfix/icejs-missing-imports-1.test.ts | 2 +- .../icejs-package-json-dependencies.test.ts | 10 +- .../demo01/expected/demo-project/package.json | 2 +- .../demo02/expected/demo-project/package.json | 6 +- .../demo-project/src/pages/Home/index.jsx | 2 + .../demo03/expected/demo-project/package.json | 2 +- .../demo04/expected/demo-project/package.json | 2 +- .../demo05/expected/demo-project/package.json | 2 +- .../expected/demo-project/package.json | 2 +- .../expected/demo-project/package.json | 2 +- .../expected/demo-project/package.json | 2 +- .../expected/demo-project/package.json | 2 +- .../expected/demo-project/package.json | 2 +- .../expected/demo-project/package.json | 4 +- .../expected/demo-project/package.json | 2 +- .../expected/demo-project/package.json | 4 +- .../demo1/expected/demo-project/package.json | 6 +- .../demo1/expected/demo-project/src/app.js | 6 +- .../expected/demo-project/src/constants.js | 2 +- .../expected/demo-project/src/global.scss | 2 +- .../demo1/expected/demo-project/src/i18n.js | 18 +- .../demo-project/src/pages/Test/index.jsx | 62 +-- .../demo1/expected/demo-project/src/routes.js | 8 +- .../demo1/expected/demo-project/src/utils.js | 2 +- .../expected/demo-project/package.json | 4 +- .../expected/demo-project/src/app.js | 6 +- .../expected/demo-project/src/global.scss | 2 +- .../expected/demo-project/src/i18n.js | 18 +- .../demo-project/src/pages/Aaaa/index.jsx | 26 +- .../expected/demo-project/src/routes.js | 8 +- .../expected/demo-project/src/utils.js | 8 +- .../demo2/expected/demo-project/package.json | 2 +- .../demo2/expected/demo-project/src/app.js | 6 +- .../expected/demo-project/src/constants.js | 2 +- .../expected/demo-project/src/global.scss | 2 +- .../demo2/expected/demo-project/src/i18n.js | 30 +- .../demo-project/src/pages/Test/index.jsx | 34 +- .../demo2/expected/demo-project/src/routes.js | 8 +- .../demo2/expected/demo-project/src/utils.js | 2 +- .../demo3/expected/demo-project/package.json | 2 +- .../demo3/expected/demo-project/src/app.js | 6 +- .../expected/demo-project/src/constants.js | 2 +- .../expected/demo-project/src/global.scss | 2 +- .../demo3/expected/demo-project/src/i18n.js | 30 +- .../demo-project/src/pages/Test/index.jsx | 14 +- .../demo3/expected/demo-project/src/routes.js | 8 +- .../demo3/expected/demo-project/src/utils.js | 2 +- .../demo4/expected/demo-project/package.json | 6 +- .../demo4/expected/demo-project/src/app.js | 6 +- .../expected/demo-project/src/global.scss | 2 +- .../demo4/expected/demo-project/src/i18n.js | 18 +- .../demo-project/src/pages/Test/index.jsx | 72 ++-- .../demo4/expected/demo-project/src/routes.js | 8 +- .../demo4/expected/demo-project/src/utils.js | 2 +- .../test-cases/react-app/demo4/schema.json5 | 10 +- .../demo5/expected/demo-project/package.json | 2 +- .../demo5/expected/demo-project/src/app.js | 6 +- .../expected/demo-project/src/global.scss | 2 +- .../demo5/expected/demo-project/src/i18n.js | 18 +- .../demo-project/src/pages/Test/index.jsx | 156 +++---- .../demo5/expected/demo-project/src/routes.js | 8 +- .../demo5/expected/demo-project/src/utils.js | 2 +- .../expected/demo-project/package.json | 6 +- .../expected/demo-project/src/app.js | 6 +- .../expected/demo-project/src/constants.js | 2 +- .../expected/demo-project/src/global.scss | 2 +- .../expected/demo-project/src/i18n.js | 18 +- .../demo-project/src/pages/Test/index.jsx | 62 +-- .../expected/demo-project/src/routes.js | 8 +- .../expected/demo-project/src/utils.js | 2 +- .../expected/demo-project/package.json | 2 +- .../expected/demo-project/src/app.js | 6 +- .../expected/demo-project/src/global.scss | 2 +- .../expected/demo-project/src/i18n.js | 18 +- .../demo-project/src/pages/Test/index.jsx | 398 +++++++++--------- .../expected/demo-project/src/routes.js | 8 +- .../expected/demo-project/src/utils.js | 2 +- .../expected/demo-project/package.json | 4 +- .../expected/demo-project/src/app.js | 6 +- .../expected/demo-project/src/global.scss | 2 +- .../expected/demo-project/src/i18n.js | 18 +- .../demo-project/src/pages/Example/index.jsx | 30 +- .../expected/demo-project/src/routes.js | 8 +- .../expected/demo-project/src/utils.js | 2 +- .../expected/demo-project/package.json | 4 +- .../expected/demo-project/src/app.js | 6 +- .../src/components/Index/index.jsx | 120 ------ .../expected/demo-project/src/global.scss | 2 +- .../expected/demo-project/src/i18n.js | 18 +- .../{components/Index => pages/$}/index.css | 0 .../demo-project/src/pages/$/index.jsx | 79 ++++ .../expected/demo-project/src/routes.js | 13 +- .../expected/demo-project/src/utils.js | 2 +- .../expected/demo-project/package.json | 2 +- .../expected/demo-project/src/app.js | 6 +- .../expected/demo-project/src/global.scss | 2 +- .../expected/demo-project/src/i18n.js | 18 +- .../demo-project/src/pages/Test/index.jsx | 226 +++++----- .../expected/demo-project/src/routes.js | 8 +- .../expected/demo-project/src/utils.js | 2 +- .../expected/demo-project/package.json | 2 +- .../expected/demo-project/src/app.js | 6 +- .../expected/demo-project/src/global.scss | 2 +- .../expected/demo-project/src/i18n.js | 18 +- .../demo-project/src/pages/Test/index.jsx | 293 ++++++------- .../expected/demo-project/src/routes.js | 8 +- .../expected/demo-project/src/utils.js | 2 +- .../__snapshots__/prettier.test.ts.snap | 4 +- 110 files changed, 1078 insertions(+), 1103 deletions(-) delete mode 100644 modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/components/Index/index.jsx rename modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/{components/Index => pages/$}/index.css (100%) create mode 100644 modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/pages/$/index.jsx diff --git a/modules/code-generator/tests/bugfix/i18n-with-params.test.ts b/modules/code-generator/tests/bugfix/i18n-with-params.test.ts index be2d5e9e6..d640525eb 100644 --- a/modules/code-generator/tests/bugfix/i18n-with-params.test.ts +++ b/modules/code-generator/tests/bugfix/i18n-with-params.test.ts @@ -19,7 +19,7 @@ describe(testCaseBaseName, () => { ` diff --git a/modules/code-generator/tests/bugfix/icejs-import-wrong-naming.test.ts b/modules/code-generator/tests/bugfix/icejs-import-wrong-naming.test.ts index 51e22b3a9..1f29fe612 100644 --- a/modules/code-generator/tests/bugfix/icejs-import-wrong-naming.test.ts +++ b/modules/code-generator/tests/bugfix/icejs-import-wrong-naming.test.ts @@ -27,7 +27,7 @@ describe(testCaseBaseName, () => { }); const generatedPageFileContent = readOutputTextFile('demo-project/src/pages/Test/index.jsx'); - expect(generatedPageFileContent).toContain(`import Foo from "example-package/lib/index.js";`); + expect(generatedPageFileContent).toContain('import Foo from \'example-package/lib/index.js\';'); }); test('named import with no alias', async () => { @@ -47,7 +47,7 @@ describe(testCaseBaseName, () => { const generatedPageFileContent = readOutputTextFile('demo-project/src/pages/Test/index.jsx'); expect(generatedPageFileContent).toContain( - `import { Foo } from "example-package/lib/index.js";`, + 'import { Foo } from \'example-package/lib/index.js\';', ); }); @@ -68,7 +68,7 @@ describe(testCaseBaseName, () => { const generatedPageFileContent = readOutputTextFile('demo-project/src/pages/Test/index.jsx'); expect(generatedPageFileContent).toContain( - `import { Bar as Foo } from "example-package/lib/index.js";`, + 'import { Bar as Foo } from \'example-package/lib/index.js\';', ); }); @@ -88,7 +88,7 @@ describe(testCaseBaseName, () => { }); const generatedPageFileContent = readOutputTextFile('demo-project/src/pages/Test/index.jsx'); - expect(generatedPageFileContent).toContain(`import Foo from "example-package/lib/index.js";`); + expect(generatedPageFileContent).toContain('import Foo from \'example-package/lib/index.js\';'); }); test('default import with sub name and export name', async () => { @@ -107,9 +107,9 @@ describe(testCaseBaseName, () => { }); const generatedPageFileContent = readOutputTextFile('demo-project/src/pages/Test/index.jsx'); - expect(generatedPageFileContent).toContain(`import Bar from "example-package/lib/index.js";`); + expect(generatedPageFileContent).toContain('import Bar from \'example-package/lib/index.js\';'); - expect(generatedPageFileContent).toContain(`const Foo = Bar.Baz;`); + expect(generatedPageFileContent).toContain('const Foo = Bar.Baz;'); }); test('default import with sub name without export name', async () => { @@ -129,10 +129,10 @@ describe(testCaseBaseName, () => { const generatedPageFileContent = readOutputTextFile('demo-project/src/pages/Test/index.jsx'); expect(generatedPageFileContent).toContain( - `import __$examplePackage_default from "example-package/lib/index.js";`, + 'import __$examplePackage_default from \'example-package/lib/index.js\';', ); - expect(generatedPageFileContent).toContain(`const Foo = __$examplePackage_default.Baz;`); + expect(generatedPageFileContent).toContain('const Foo = __$examplePackage_default.Baz;'); }); test('named import with sub name', async () => { @@ -152,10 +152,10 @@ describe(testCaseBaseName, () => { const generatedPageFileContent = readOutputTextFile('demo-project/src/pages/Test/index.jsx'); expect(generatedPageFileContent).toContain( - `import { Bar } from "example-package/lib/index.js";`, + 'import { Bar } from \'example-package/lib/index.js\';', ); - expect(generatedPageFileContent).toContain(`const Foo = Bar.Baz;`); + expect(generatedPageFileContent).toContain('const Foo = Bar.Baz;'); }); test('default imports with different componentName', async () => { @@ -187,11 +187,11 @@ describe(testCaseBaseName, () => { }); const generatedPageFileContent = readOutputTextFile('demo-project/src/pages/Test/index.jsx'); - expect(generatedPageFileContent).toContain(`import Foo from "example-package";`); - expect(generatedPageFileContent).toContain(`import Baz from "example-package";`); + expect(generatedPageFileContent).toContain('import Foo from \'example-package\';'); + expect(generatedPageFileContent).toContain('import Baz from \'example-package\';'); - expect(generatedPageFileContent).not.toContain(`const Foo =`); - expect(generatedPageFileContent).not.toContain(`const Baz =`); + expect(generatedPageFileContent).not.toContain('const Foo ='); + expect(generatedPageFileContent).not.toContain('const Baz ='); }); }); diff --git a/modules/code-generator/tests/bugfix/icejs-missing-imports-1.test.ts b/modules/code-generator/tests/bugfix/icejs-missing-imports-1.test.ts index 17c40a4fa..cad73474a 100644 --- a/modules/code-generator/tests/bugfix/icejs-missing-imports-1.test.ts +++ b/modules/code-generator/tests/bugfix/icejs-missing-imports-1.test.ts @@ -22,7 +22,7 @@ test(testCaseBaseName, async () => { Button, Typography, Tag, -} from "@alilc/antd-lowcode-materials/dist/antd-lowcode.esm.js";`); +} from '@alilc/antd-lowcode-materials/dist/antd-lowcode.esm.js';`); }); function exportProject(inputPath: string, outputPath: string) { diff --git a/modules/code-generator/tests/bugfix/icejs-package-json-dependencies.test.ts b/modules/code-generator/tests/bugfix/icejs-package-json-dependencies.test.ts index 6edd6b912..88ca02c6b 100644 --- a/modules/code-generator/tests/bugfix/icejs-package-json-dependencies.test.ts +++ b/modules/code-generator/tests/bugfix/icejs-package-json-dependencies.test.ts @@ -19,15 +19,15 @@ test(testCaseBaseName, async () => { // 里面有的数据源则应该生成对应的 dependencies expect(generatedPackageJson.dependencies).toMatchObject({ - '@alilc/lowcode-datasource-engine': 'latest', - '@alilc/lowcode-datasource-fetch-handler': 'latest', + '@alilc/lowcode-datasource-engine': '^1.0.0', + '@alilc/lowcode-datasource-fetch-handler': '^1.0.0', }); // 里面没有的,则不应该生成对应的 dependencies expect(generatedPackageJson.dependencies).not.toMatchObject({ - '@alilc/lowcode-datasource-url-params-handler': 'latest', - '@alilc/lowcode-datasource-mtop-handler': 'latest', - '@alilc/lowcode-datasource-mopen-handler': 'latest', + '@alilc/lowcode-datasource-url-params-handler': '^1.0.0', + '@alilc/lowcode-datasource-mtop-handler': '^1.0.0', + '@alilc/lowcode-datasource-mopen-handler': '^1.0.0', }); }); diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/package.json index 38cfdd186..fd03ed9bc 100644 --- a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/package.json +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/package.json @@ -11,7 +11,7 @@ "lint": "npm run eslint && npm run stylelint" }, "dependencies": { - "@alilc/lowcode-datasource-engine": "latest", + "@alilc/lowcode-datasource-engine": "^1.0.0", "universal-env": "^3.2.0", "intl-messageformat": "^9.3.6", "rax": "^1.1.0", diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/package.json index ca5a0f59c..4d9a77988 100644 --- a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/package.json +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/package.json @@ -11,9 +11,9 @@ "lint": "npm run eslint && npm run stylelint" }, "dependencies": { - "@alilc/lowcode-datasource-engine": "latest", - "@alilc/lowcode-datasource-url-params-handler": "latest", - "@alilc/lowcode-datasource-fetch-handler": "latest", + "@alilc/lowcode-datasource-engine": "^1.0.0", + "@alilc/lowcode-datasource-url-params-handler": "^1.0.0", + "@alilc/lowcode-datasource-fetch-handler": "^1.0.0", "universal-env": "^3.2.0", "intl-messageformat": "^9.3.6", "rax": "^1.1.0", diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/pages/Home/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/pages/Home/index.jsx index 06e39454d..7bfda59ca 100644 --- a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/pages/Home/index.jsx +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/pages/Home/index.jsx @@ -253,6 +253,7 @@ class Home$$Page extends Component { if (!response.success) { throw new Error(response.message); } + return response.data; }, isInit: true, @@ -279,6 +280,7 @@ class Home$$Page extends Component { if (!response.success) { throw new Error(response.message); } + return response.data.result; }, isInit: true, diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/package.json index 48690ff4d..58b97921b 100644 --- a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/package.json +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/package.json @@ -11,7 +11,7 @@ "lint": "npm run eslint && npm run stylelint" }, "dependencies": { - "@alilc/lowcode-datasource-engine": "latest", + "@alilc/lowcode-datasource-engine": "^1.0.0", "universal-env": "^3.2.0", "intl-messageformat": "^9.3.6", "rax": "^1.1.0", diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/package.json index 16fa70bbc..56dda7653 100644 --- a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/package.json +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/package.json @@ -11,7 +11,7 @@ "lint": "npm run eslint && npm run stylelint" }, "dependencies": { - "@alilc/lowcode-datasource-engine": "latest", + "@alilc/lowcode-datasource-engine": "^1.0.0", "universal-env": "^3.2.0", "intl-messageformat": "^9.3.6", "rax": "^1.1.0", diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/package.json index 38cfdd186..fd03ed9bc 100644 --- a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/package.json +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/package.json @@ -11,7 +11,7 @@ "lint": "npm run eslint && npm run stylelint" }, "dependencies": { - "@alilc/lowcode-datasource-engine": "latest", + "@alilc/lowcode-datasource-engine": "^1.0.0", "universal-env": "^3.2.0", "intl-messageformat": "^9.3.6", "rax": "^1.1.0", diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/package.json index bf31a967e..dc00ba429 100644 --- a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/package.json +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/package.json @@ -11,7 +11,7 @@ "lint": "npm run eslint && npm run stylelint" }, "dependencies": { - "@alilc/lowcode-datasource-engine": "latest", + "@alilc/lowcode-datasource-engine": "^1.0.0", "universal-env": "^3.2.0", "intl-messageformat": "^9.3.6", "rax": "^1.1.0", diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/package.json index 38cfdd186..fd03ed9bc 100644 --- a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/package.json +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/package.json @@ -11,7 +11,7 @@ "lint": "npm run eslint && npm run stylelint" }, "dependencies": { - "@alilc/lowcode-datasource-engine": "latest", + "@alilc/lowcode-datasource-engine": "^1.0.0", "universal-env": "^3.2.0", "intl-messageformat": "^9.3.6", "rax": "^1.1.0", diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/package.json index bf31a967e..dc00ba429 100644 --- a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/package.json +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/package.json @@ -11,7 +11,7 @@ "lint": "npm run eslint && npm run stylelint" }, "dependencies": { - "@alilc/lowcode-datasource-engine": "latest", + "@alilc/lowcode-datasource-engine": "^1.0.0", "universal-env": "^3.2.0", "intl-messageformat": "^9.3.6", "rax": "^1.1.0", diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/package.json index bf31a967e..dc00ba429 100644 --- a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/package.json +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/package.json @@ -11,7 +11,7 @@ "lint": "npm run eslint && npm run stylelint" }, "dependencies": { - "@alilc/lowcode-datasource-engine": "latest", + "@alilc/lowcode-datasource-engine": "^1.0.0", "universal-env": "^3.2.0", "intl-messageformat": "^9.3.6", "rax": "^1.1.0", diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/package.json index bf31a967e..dc00ba429 100644 --- a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/package.json +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/package.json @@ -11,7 +11,7 @@ "lint": "npm run eslint && npm run stylelint" }, "dependencies": { - "@alilc/lowcode-datasource-engine": "latest", + "@alilc/lowcode-datasource-engine": "^1.0.0", "universal-env": "^3.2.0", "intl-messageformat": "^9.3.6", "rax": "^1.1.0", diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/package.json index 60f0cb38a..067cc161d 100644 --- a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/package.json +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/package.json @@ -11,8 +11,8 @@ "lint": "npm run eslint && npm run stylelint" }, "dependencies": { - "@alilc/lowcode-datasource-engine": "latest", - "@alilc/lowcode-datasource-url-params-handler": "latest", + "@alilc/lowcode-datasource-engine": "^1.0.0", + "@alilc/lowcode-datasource-url-params-handler": "^1.0.0", "universal-env": "^3.2.0", "intl-messageformat": "^9.3.6", "rax": "^1.1.0", diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/package.json index 38cfdd186..fd03ed9bc 100644 --- a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/package.json +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/package.json @@ -11,7 +11,7 @@ "lint": "npm run eslint && npm run stylelint" }, "dependencies": { - "@alilc/lowcode-datasource-engine": "latest", + "@alilc/lowcode-datasource-engine": "^1.0.0", "universal-env": "^3.2.0", "intl-messageformat": "^9.3.6", "rax": "^1.1.0", diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/package.json index 3e59d2984..afadad878 100644 --- a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/package.json +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/package.json @@ -11,8 +11,8 @@ "lint": "npm run eslint && npm run stylelint" }, "dependencies": { - "@alilc/lowcode-datasource-engine": "latest", - "@alilc/lowcode-datasource-http-handler": "latest", + "@alilc/lowcode-datasource-engine": "^1.0.0", + "@alilc/lowcode-datasource-http-handler": "^1.0.0", "universal-env": "^3.2.0", "intl-messageformat": "^9.3.6", "rax": "^1.1.0", diff --git a/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/package.json index 767ec3898..36eaf12f2 100644 --- a/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/package.json +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/package.json @@ -11,9 +11,9 @@ "intl-messageformat": "^9.3.6", "@ice/store": "^1.4.3", "@loadable/component": "^5.15.2", - "@alilc/lowcode-datasource-engine": "latest", - "@alilc/lowcode-datasource-url-params-handler": "latest", - "@alilc/lowcode-datasource-fetch-handler": "latest", + "@alilc/lowcode-datasource-engine": "^1.0.0", + "@alilc/lowcode-datasource-url-params-handler": "^1.0.0", + "@alilc/lowcode-datasource-fetch-handler": "^1.0.0", "@alifd/next": "1.19.18" }, "devDependencies": { diff --git a/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/app.js index fb01b106b..266d8ef71 100644 --- a/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/app.js +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/app.js @@ -1,11 +1,11 @@ -import { createApp } from "ice"; +import { createApp } from 'ice'; const appConfig = { app: { - rootId: "app", + rootId: 'app', }, router: { - type: "hash", + type: 'hash', }, }; createApp(appConfig); diff --git a/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/constants.js index c4a5859ee..91198f904 100644 --- a/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/constants.js +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/constants.js @@ -1,3 +1,3 @@ -const __$$constants = { ENV: "prod", DOMAIN: "xxx.xxx.com" }; +const __$$constants = { ENV: 'prod', DOMAIN: 'xxx.xxx.com' }; export default __$$constants; diff --git a/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/global.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/global.scss index 2d97c56b0..ed7204b4a 100644 --- a/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/global.scss +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/global.scss @@ -1,5 +1,5 @@ // 引入默认全局样式 -@import "@alifd/next/reset.scss"; +@import '@alifd/next/reset.scss'; body { -webkit-font-smoothing: antialiased; diff --git a/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/i18n.js index 1ae7c84b5..adbbe673d 100644 --- a/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/i18n.js +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/i18n.js @@ -1,9 +1,9 @@ const i18nConfig = {}; let locale = - typeof navigator === "object" && typeof navigator.language === "string" + typeof navigator === 'object' && typeof navigator.language === 'string' ? navigator.language - : "zh-CN"; + : 'zh-CN'; const getLocale = () => locale; @@ -13,22 +13,22 @@ const setLocale = (target) => { const isEmptyVariables = (variables) => (Array.isArray(variables) && variables.length === 0) || - (typeof variables === "object" && + (typeof variables === 'object' && (!variables || Object.keys(variables).length === 0)); // 按低代码规范里面的要求进行变量替换 const format = (msg, variables) => - typeof msg === "string" - ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? "") + typeof msg === 'string' + ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? '') : msg; const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { const msg = i18nConfig[locale]?.[id] ?? - i18nConfig[locale.replace("-", "_")]?.[id] ?? + i18nConfig[locale.replace('-', '_')]?.[id] ?? defaultMessage; if (msg == null) { - console.warn("[i18n]: unknown message id: %o (locale=%o)", id, locale); + console.warn('[i18n]: unknown message id: %o (locale=%o)', id, locale); return fallback === undefined ? `${id}` : fallback; } @@ -49,7 +49,7 @@ const _inject2 = (target) => { }; target._i18nText = (t) => { // 优先取直接传过来的语料 - const localMsg = t[locale] ?? t[String(locale).replace("-", "_")]; + const localMsg = t[locale] ?? t[String(locale).replace('-', '_')]; if (localMsg != null) { return format(localMsg, t.params); } @@ -61,7 +61,7 @@ const _inject2 = (target) => { } // 兜底用 use 指定的或默认语言的 - return format(t[t.use || "zh-CN"] ?? t.en_US, t.params); + return format(t[t.use || 'zh-CN'] ?? t.en_US, t.params); }; // 注入到上下文中去 diff --git a/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/pages/Test/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/pages/Test/index.jsx index b90fe6254..c8db61db7 100644 --- a/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/pages/Test/index.jsx +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/pages/Test/index.jsx @@ -1,22 +1,22 @@ // 注意: 出码引擎注入的临时变量默认都以 "__$$" 开头,禁止在搭建的代码中直接访问。 // 例外:react 框架的导出名和各种组件名除外。 -import React from "react"; +import React from 'react'; -import { Form, Input, NumberPicker, Select, Button } from "@alifd/next"; +import { Form, Input, NumberPicker, Select, Button } from '@alifd/next'; -import { createUrlParamsHandler as __$$createUrlParamsRequestHandler } from "@alilc/lowcode-datasource-url-params-handler"; +import { createUrlParamsHandler as __$$createUrlParamsRequestHandler } from '@alilc/lowcode-datasource-url-params-handler'; -import { createFetchHandler as __$$createFetchRequestHandler } from "@alilc/lowcode-datasource-fetch-handler"; +import { createFetchHandler as __$$createFetchRequestHandler } from '@alilc/lowcode-datasource-fetch-handler'; -import { create as __$$createDataSourceEngine } from "@alilc/lowcode-datasource-engine/runtime"; +import { create as __$$createDataSourceEngine } from '@alilc/lowcode-datasource-engine/runtime'; -import utils, { RefsManager } from "../../utils"; +import utils, { RefsManager } from '../../utils'; -import * as __$$i18n from "../../i18n"; +import * as __$$i18n from '../../i18n'; -import __$$constants from "../../constants"; +import __$$constants from '../../constants'; -import "./index.css"; +import './index.css'; class Test$$Page extends React.Component { _context = this; @@ -51,7 +51,7 @@ class Test$$Page extends React.Component { __$$i18n._inject2(this); - this.state = { text: "outter" }; + this.state = { text: 'outter' }; } $ = (refName) => { @@ -67,8 +67,8 @@ class Test$$Page extends React.Component { return { list: [ { - id: "urlParams", - type: "urlParams", + id: 'urlParams', + type: 'urlParams', isInit: function () { return undefined; }, @@ -77,12 +77,12 @@ class Test$$Page extends React.Component { }, }, { - id: "user", - type: "fetch", + id: 'user', + type: 'fetch', options: function () { return { - method: "GET", - uri: "https://shs.xxx.com/mock/1458/demo/user", + method: 'GET', + uri: 'https://shs.xxx.com/mock/1458/demo/user', isSync: true, }; }, @@ -90,6 +90,7 @@ class Test$$Page extends React.Component { if (!response.data.success) { throw new Error(response.data.message); } + return response.data.data; }, isInit: function () { @@ -97,12 +98,12 @@ class Test$$Page extends React.Component { }, }, { - id: "orders", - type: "fetch", + id: 'orders', + type: 'fetch', options: function () { return { - method: "GET", - uri: "https://shs.xxx.com/mock/1458/demo/orders", + method: 'GET', + uri: 'https://shs.xxx.com/mock/1458/demo/orders', isSync: true, }; }, @@ -110,6 +111,7 @@ class Test$$Page extends React.Component { if (!response.data.success) { throw new Error(response.data.message); } + return response.data.data.result; }, isInit: function () { @@ -118,7 +120,7 @@ class Test$$Page extends React.Component { }, ], dataHandler: function (dataMap) { - console.info("All datasources loaded:", dataMap); + console.info('All datasources loaded:', dataMap); }, }; } @@ -126,18 +128,18 @@ class Test$$Page extends React.Component { componentDidMount() { this._dataSourceEngine.reloadDataSource(); - console.log("componentDidMount"); + console.log('componentDidMount'); } render() { const __$$context = this._context || this; const { state } = __$$context; return ( -
+
this.state.colNum)} style={{}} - ref={this._refsManager.linkRef("testForm")} + ref={this._refsManager.linkRef('testForm')} > @@ -148,18 +150,18 @@ class Test$$Page extends React.Component { -
+