@modern-js/new-action 2.0.0-beta.3 → 2.0.0-beta.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +32 -0
- package/dist/js/modern/index.js +1 -1
- package/dist/js/modern/module.js +107 -47
- package/dist/js/modern/monorepo.js +53 -33
- package/dist/js/modern/mwa.js +117 -45
- package/dist/js/modern/utils/index.js +21 -19
- package/dist/js/node/index.js +20 -49
- package/dist/js/node/module.js +121 -61
- package/dist/js/node/monorepo.js +81 -44
- package/dist/js/node/mwa.js +127 -58
- package/dist/js/node/utils/index.js +46 -30
- package/package.json +6 -6
package/dist/js/node/mwa.js
CHANGED
|
@@ -1,101 +1,170 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
+
var __export = (target, all) => {
|
|
6
|
+
for (var name in all)
|
|
7
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
8
|
+
};
|
|
9
|
+
var __copyProps = (to, from, except, desc) => {
|
|
10
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
+
for (let key of __getOwnPropNames(from))
|
|
12
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
+
}
|
|
15
|
+
return to;
|
|
16
|
+
};
|
|
17
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
+
var stdin_exports = {};
|
|
19
|
+
__export(stdin_exports, {
|
|
20
|
+
MWANewAction: () => MWANewAction
|
|
5
21
|
});
|
|
6
|
-
exports
|
|
7
|
-
var
|
|
8
|
-
var
|
|
9
|
-
var
|
|
10
|
-
var
|
|
11
|
-
var
|
|
12
|
-
var
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
22
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
23
|
+
var import_lodash = require("@modern-js/utils/lodash");
|
|
24
|
+
var import_codesmith = require("@modern-js/codesmith");
|
|
25
|
+
var import_codesmith_formily = require("@modern-js/codesmith-formily");
|
|
26
|
+
var import_generator_common = require("@modern-js/generator-common");
|
|
27
|
+
var import_generator_utils = require("@modern-js/generator-utils");
|
|
28
|
+
var import_utils = require("./utils");
|
|
29
|
+
var __defProp2 = Object.defineProperty;
|
|
30
|
+
var __defProps = Object.defineProperties;
|
|
31
|
+
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
32
|
+
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
33
|
+
var __hasOwnProp2 = Object.prototype.hasOwnProperty;
|
|
34
|
+
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
35
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
36
|
+
var __spreadValues = (a, b) => {
|
|
37
|
+
for (var prop in b || (b = {}))
|
|
38
|
+
if (__hasOwnProp2.call(b, prop))
|
|
39
|
+
__defNormalProp(a, prop, b[prop]);
|
|
40
|
+
if (__getOwnPropSymbols)
|
|
41
|
+
for (var prop of __getOwnPropSymbols(b)) {
|
|
42
|
+
if (__propIsEnum.call(b, prop))
|
|
43
|
+
__defNormalProp(a, prop, b[prop]);
|
|
44
|
+
}
|
|
45
|
+
return a;
|
|
46
|
+
};
|
|
47
|
+
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
48
|
+
var __async = (__this, __arguments, generator) => {
|
|
49
|
+
return new Promise((resolve, reject) => {
|
|
50
|
+
var fulfilled = (value) => {
|
|
51
|
+
try {
|
|
52
|
+
step(generator.next(value));
|
|
53
|
+
} catch (e) {
|
|
54
|
+
reject(e);
|
|
55
|
+
}
|
|
56
|
+
};
|
|
57
|
+
var rejected = (value) => {
|
|
58
|
+
try {
|
|
59
|
+
step(generator.throw(value));
|
|
60
|
+
} catch (e) {
|
|
61
|
+
reject(e);
|
|
62
|
+
}
|
|
63
|
+
};
|
|
64
|
+
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
65
|
+
step((generator = generator.apply(__this, __arguments)).next());
|
|
66
|
+
});
|
|
67
|
+
};
|
|
68
|
+
const MWANewAction = (options) => __async(void 0, null, function* () {
|
|
17
69
|
const {
|
|
18
|
-
locale =
|
|
19
|
-
distTag =
|
|
70
|
+
locale = "zh",
|
|
71
|
+
distTag = "",
|
|
20
72
|
debug = false,
|
|
21
|
-
registry =
|
|
22
|
-
config =
|
|
73
|
+
registry = "",
|
|
74
|
+
config = "{}",
|
|
23
75
|
cwd = process.cwd()
|
|
24
76
|
} = options;
|
|
25
77
|
let UserConfig = {};
|
|
26
78
|
try {
|
|
27
79
|
UserConfig = JSON.parse(config);
|
|
28
80
|
} catch (e) {
|
|
29
|
-
throw new Error(
|
|
81
|
+
throw new Error("config is not a valid json");
|
|
30
82
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
});
|
|
34
|
-
const smith = new _codesmith.CodeSmith({
|
|
83
|
+
import_generator_common.i18n.changeLanguage({ locale: UserConfig.locale || locale });
|
|
84
|
+
const smith = new import_codesmith.CodeSmith({
|
|
35
85
|
debug,
|
|
36
86
|
registryUrl: registry
|
|
37
87
|
});
|
|
38
|
-
if (!(0,
|
|
39
|
-
smith.logger.warn(
|
|
88
|
+
if (!(0, import_utils.alreadyRepo)(cwd)) {
|
|
89
|
+
smith.logger.warn("not valid modern.js repo");
|
|
40
90
|
}
|
|
41
|
-
const formilyAPI = new
|
|
91
|
+
const formilyAPI = new import_codesmith_formily.FormilyAPI({
|
|
42
92
|
materials: {},
|
|
43
93
|
config: {},
|
|
44
94
|
data: {},
|
|
45
95
|
current: null
|
|
46
96
|
});
|
|
47
97
|
const funcMap = {};
|
|
48
|
-
|
|
49
|
-
const enable = (0,
|
|
98
|
+
import_generator_common.MWAActionFunctions.forEach((func) => {
|
|
99
|
+
const enable = (0, import_utils.hasEnabledFunction)(
|
|
100
|
+
func,
|
|
101
|
+
import_generator_common.MWAActionFunctionsDependencies,
|
|
102
|
+
import_generator_common.MWAActionFunctionsDevDependencies,
|
|
103
|
+
{},
|
|
104
|
+
cwd
|
|
105
|
+
);
|
|
50
106
|
funcMap[func] = enable;
|
|
51
107
|
});
|
|
52
108
|
const refactorMap = {};
|
|
53
|
-
|
|
54
|
-
const enable = (0,
|
|
109
|
+
import_generator_common.MWAActionReactors.forEach((refactor) => {
|
|
110
|
+
const enable = (0, import_utils.hasEnabledFunction)(
|
|
111
|
+
refactor,
|
|
112
|
+
import_generator_common.MWAActionRefactorDependencies,
|
|
113
|
+
{},
|
|
114
|
+
{},
|
|
115
|
+
cwd
|
|
116
|
+
);
|
|
55
117
|
refactorMap[refactor] = enable;
|
|
56
118
|
});
|
|
57
|
-
const ans =
|
|
119
|
+
const ans = yield formilyAPI.getInputBySchemaFunc(import_generator_common.getMWANewActionSchema, __spreadProps(__spreadValues({}, UserConfig), {
|
|
58
120
|
funcMap,
|
|
59
121
|
refactorMap
|
|
60
122
|
}));
|
|
61
123
|
const actionType = ans.actionType;
|
|
62
124
|
const action = ans[actionType];
|
|
63
|
-
const generator = (0,
|
|
125
|
+
const generator = (0, import_utils.getGeneratorPath)(
|
|
126
|
+
import_generator_common.MWANewActionGenerators[actionType][action],
|
|
127
|
+
distTag
|
|
128
|
+
);
|
|
64
129
|
if (!generator) {
|
|
65
130
|
throw new Error(`no valid option`);
|
|
66
131
|
}
|
|
67
|
-
const getMwaPluginVersion = packageName => {
|
|
68
|
-
return (0,
|
|
132
|
+
const getMwaPluginVersion = (packageName) => {
|
|
133
|
+
return (0, import_generator_utils.getModernPluginVersion)(import_generator_common.Solution.MWA, packageName, {
|
|
69
134
|
registry,
|
|
70
135
|
distTag,
|
|
71
136
|
cwd
|
|
72
137
|
});
|
|
73
138
|
};
|
|
74
|
-
const devDependency =
|
|
75
|
-
const dependency =
|
|
76
|
-
const finalConfig = (0,
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
[
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
139
|
+
const devDependency = import_generator_common.MWAActionFunctionsDevDependencies[action];
|
|
140
|
+
const dependency = import_generator_common.MWAActionFunctionsDependencies[action] || import_generator_common.MWAActionRefactorDependencies[action];
|
|
141
|
+
const finalConfig = (0, import_lodash.merge)(
|
|
142
|
+
UserConfig,
|
|
143
|
+
ans,
|
|
144
|
+
{
|
|
145
|
+
locale: UserConfig.locale || locale,
|
|
146
|
+
packageManager: UserConfig.packageManager || (yield (0, import_generator_utils.getPackageManager)(cwd)),
|
|
147
|
+
distTag
|
|
148
|
+
},
|
|
149
|
+
{
|
|
150
|
+
devDependencies: devDependency ? { [devDependency]: `${yield getMwaPluginVersion(devDependency)}` } : {},
|
|
151
|
+
dependencies: dependency ? {
|
|
152
|
+
[dependency]: `${yield getMwaPluginVersion(dependency)}`
|
|
153
|
+
} : {},
|
|
154
|
+
appendTypeContent: import_generator_common.MWAActionFunctionsAppendTypeContent[action] || import_generator_common.MWAActionReactorAppendTypeContent[action]
|
|
155
|
+
}
|
|
156
|
+
);
|
|
157
|
+
const task = [
|
|
158
|
+
{
|
|
159
|
+
name: generator,
|
|
160
|
+
config: finalConfig
|
|
161
|
+
}
|
|
162
|
+
];
|
|
163
|
+
yield smith.forge({
|
|
164
|
+
tasks: task.map((runner) => ({
|
|
95
165
|
generator: runner.name,
|
|
96
166
|
config: runner.config
|
|
97
167
|
})),
|
|
98
168
|
pwd: cwd
|
|
99
169
|
});
|
|
100
|
-
};
|
|
101
|
-
exports.MWANewAction = MWANewAction;
|
|
170
|
+
});
|
|
@@ -1,62 +1,78 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
1
|
+
var __create = Object.create;
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
6
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
7
|
+
var __export = (target, all) => {
|
|
8
|
+
for (var name in all)
|
|
9
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
10
|
+
};
|
|
11
|
+
var __copyProps = (to, from, except, desc) => {
|
|
12
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
13
|
+
for (let key of __getOwnPropNames(from))
|
|
14
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
15
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
16
|
+
}
|
|
17
|
+
return to;
|
|
18
|
+
};
|
|
19
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
20
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
21
|
+
mod
|
|
22
|
+
));
|
|
23
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
24
|
+
var stdin_exports = {};
|
|
25
|
+
__export(stdin_exports, {
|
|
26
|
+
alreadyRepo: () => alreadyRepo,
|
|
27
|
+
getGeneratorPath: () => getGeneratorPath,
|
|
28
|
+
hasEnabledFunction: () => hasEnabledFunction,
|
|
29
|
+
readJson: () => readJson
|
|
5
30
|
});
|
|
6
|
-
exports
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
var _path = _interopRequireDefault(require("path"));
|
|
11
|
-
var _utils = require("@modern-js/utils");
|
|
12
|
-
var _generatorUtils = require("@modern-js/generator-utils");
|
|
13
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
31
|
+
module.exports = __toCommonJS(stdin_exports);
|
|
32
|
+
var import_path = __toESM(require("path"));
|
|
33
|
+
var import_utils = require("@modern-js/utils");
|
|
34
|
+
var import_generator_utils = require("@modern-js/generator-utils");
|
|
14
35
|
function alreadyRepo(cwd = process.cwd()) {
|
|
15
36
|
try {
|
|
16
|
-
return
|
|
37
|
+
return import_generator_utils.fs.existsSync(import_path.default.resolve(cwd, "package.json"));
|
|
17
38
|
} catch (e) {
|
|
18
39
|
return false;
|
|
19
40
|
}
|
|
20
41
|
}
|
|
21
|
-
const readJson = jsonPath => {
|
|
22
|
-
if (!
|
|
42
|
+
const readJson = (jsonPath) => {
|
|
43
|
+
if (!import_generator_utils.fs.existsSync(jsonPath)) {
|
|
23
44
|
return {};
|
|
24
45
|
}
|
|
25
|
-
const jsonStr =
|
|
26
|
-
encoding: 'utf8'
|
|
27
|
-
});
|
|
46
|
+
const jsonStr = import_generator_utils.fs.readFileSync(jsonPath, { encoding: "utf8" });
|
|
28
47
|
try {
|
|
29
|
-
return
|
|
48
|
+
return import_utils.json5.parse(jsonStr);
|
|
30
49
|
} catch (error) {
|
|
31
50
|
throw Error(`${jsonPath} is not a valid json, please check and try again.`);
|
|
32
51
|
}
|
|
33
52
|
};
|
|
34
|
-
exports.readJson = readJson;
|
|
35
53
|
function hasEnabledFunction(action, dependencies, devDependencies, peerDependencies, cwd) {
|
|
36
|
-
|
|
54
|
+
var _a, _b, _c;
|
|
55
|
+
const packageJsonPath = import_path.default.normalize(`${cwd}/package.json`);
|
|
37
56
|
const packageJson = readJson(packageJsonPath);
|
|
38
57
|
if (!dependencies[action] && !devDependencies[action]) {
|
|
39
58
|
return false;
|
|
40
59
|
}
|
|
41
60
|
if (dependencies[action]) {
|
|
42
|
-
|
|
43
|
-
return (_packageJson$dependen = packageJson.dependencies) === null || _packageJson$dependen === void 0 ? void 0 : _packageJson$dependen[dependencies[action]];
|
|
61
|
+
return (_a = packageJson.dependencies) == null ? void 0 : _a[dependencies[action]];
|
|
44
62
|
}
|
|
45
63
|
if (peerDependencies[action]) {
|
|
46
|
-
|
|
47
|
-
return (_packageJson$peerDepe = packageJson.peerDependencies) === null || _packageJson$peerDepe === void 0 ? void 0 : _packageJson$peerDepe[peerDependencies[action]];
|
|
64
|
+
return (_b = packageJson.peerDependencies) == null ? void 0 : _b[peerDependencies[action]];
|
|
48
65
|
}
|
|
49
66
|
if (!peerDependencies[action] && devDependencies[action]) {
|
|
50
|
-
|
|
51
|
-
return (_packageJson$devDepen = packageJson.devDependencies) === null || _packageJson$devDepen === void 0 ? void 0 : _packageJson$devDepen[devDependencies[action]];
|
|
67
|
+
return (_c = packageJson.devDependencies) == null ? void 0 : _c[devDependencies[action]];
|
|
52
68
|
}
|
|
53
69
|
return false;
|
|
54
70
|
}
|
|
55
71
|
function getGeneratorPath(generator, distTag) {
|
|
56
|
-
if (process.env.CODESMITH_ENV ===
|
|
57
|
-
return
|
|
72
|
+
if (process.env.CODESMITH_ENV === "development") {
|
|
73
|
+
return import_path.default.dirname(require.resolve(generator));
|
|
58
74
|
} else if (distTag) {
|
|
59
75
|
return `${generator}@${distTag}`;
|
|
60
76
|
}
|
|
61
77
|
return generator;
|
|
62
|
-
}
|
|
78
|
+
}
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"modern",
|
|
12
12
|
"modern.js"
|
|
13
13
|
],
|
|
14
|
-
"version": "2.0.0-beta.
|
|
14
|
+
"version": "2.0.0-beta.4",
|
|
15
15
|
"jsnext:source": "./src/index.ts",
|
|
16
16
|
"types": "./dist/types/index.d.ts",
|
|
17
17
|
"main": "./dist/js/node/index.js",
|
|
@@ -30,17 +30,17 @@
|
|
|
30
30
|
"@babel/runtime": "^7.18.0",
|
|
31
31
|
"@modern-js/codesmith": "2.0.2",
|
|
32
32
|
"@modern-js/codesmith-formily": "2.0.2",
|
|
33
|
-
"@modern-js/generator-common": "3.0.0-beta.
|
|
34
|
-
"@modern-js/generator-utils": "3.0.0-beta.
|
|
35
|
-
"@modern-js/utils": "2.0.0-beta.
|
|
33
|
+
"@modern-js/generator-common": "3.0.0-beta.4",
|
|
34
|
+
"@modern-js/generator-utils": "3.0.0-beta.4",
|
|
35
|
+
"@modern-js/utils": "2.0.0-beta.4"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
38
|
"@types/jest": "^27",
|
|
39
39
|
"@types/node": "^14",
|
|
40
40
|
"jest": "^27",
|
|
41
41
|
"typescript": "^4",
|
|
42
|
-
"@scripts/build": "2.0.0-beta.
|
|
43
|
-
"@scripts/jest-config": "2.0.0-beta.
|
|
42
|
+
"@scripts/build": "2.0.0-beta.4",
|
|
43
|
+
"@scripts/jest-config": "2.0.0-beta.4"
|
|
44
44
|
},
|
|
45
45
|
"sideEffects": false,
|
|
46
46
|
"modernConfig": {
|