steedos-cli 2.2.55-beta.9 → 2.3.0-beta.11
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/default.steedos.config.js +13 -0
- package/default.steedos.settings.yml +1 -0
- package/dist/auth/index.js +0 -1
- package/dist/auth/index.js.map +1 -1
- package/dist/commands/auth/login.js +0 -2
- package/dist/commands/auth/login.js.map +1 -1
- package/dist/commands/data/export.js +0 -5
- package/dist/commands/data/export.js.map +1 -1
- package/dist/commands/data/import.js +0 -3
- package/dist/commands/data/import.js.map +1 -1
- package/dist/commands/i18n.js +0 -2
- package/dist/commands/i18n.js.map +1 -1
- package/dist/commands/package/build.js +0 -2
- package/dist/commands/package/build.js.map +1 -1
- package/dist/commands/source/config.js +0 -2
- package/dist/commands/source/config.js.map +1 -1
- package/dist/commands/source/convert.js +0 -5
- package/dist/commands/source/convert.js.map +1 -1
- package/dist/commands/source/deploy.js +1 -1
- package/dist/commands/source/deploy.js.map +1 -1
- package/dist/commands/source/retrieve.js +0 -13
- package/dist/commands/source/retrieve.js.map +1 -1
- package/dist/commands/start.js +0 -99
- package/dist/commands/start.js.map +1 -1
- package/dist/i18n/convert.js +0 -4
- package/dist/i18n/convert.js.map +1 -1
- package/dist/i18n/index.js +3 -20
- package/dist/i18n/index.js.map +1 -1
- package/dist/source/convert/jsontofiles.js +0 -49
- package/dist/source/convert/jsontofiles.js.map +1 -1
- package/dist/source/convert/loadfiletojson.js +0 -71
- package/dist/source/convert/loadfiletojson.js.map +1 -1
- package/dist/source/convert/steedosPackageJson.js +3 -23
- package/dist/source/convert/steedosPackageJson.js.map +1 -1
- package/dist/source/deploy/index.d.ts +0 -4
- package/dist/source/deploy/index.js +0 -4
- package/dist/source/deploy/index.js.map +1 -1
- package/dist/source/retrieve/index.d.ts +0 -5
- package/dist/source/retrieve/index.js +0 -13
- package/dist/source/retrieve/index.js.map +1 -1
- package/dist/start/index.js +0 -1
- package/dist/start/index.js.map +1 -1
- package/dist/util/index.js +0 -1
- package/dist/util/index.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +3 -3
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
const _ = require("lodash")
|
|
2
3
|
|
|
3
4
|
require('dotenv-flow').config(
|
|
4
5
|
{
|
|
@@ -6,6 +7,18 @@ require('dotenv-flow').config(
|
|
|
6
7
|
silent: true
|
|
7
8
|
});
|
|
8
9
|
|
|
10
|
+
if(_.isEmpty(process.env.STEEDOS_TENANT_ENABLE_PASSWORD_LOGIN)) {
|
|
11
|
+
process.env.STEEDOS_TENANT_ENABLE_PASSWORD_LOGIN = 'true';
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
const pageAsseturls = "https://unpkg.com/@steedos-ui/builder-widgets@2.2.37/dist/assets.json";
|
|
15
|
+
if (process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS){
|
|
16
|
+
process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = pageAsseturls + "," + process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS;
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = pageAsseturls;
|
|
20
|
+
}
|
|
21
|
+
|
|
9
22
|
/**
|
|
10
23
|
* Steedos ServiceBroker configuration file
|
|
11
24
|
*
|
package/dist/auth/index.js
CHANGED
|
@@ -8,7 +8,6 @@ const metadata_core_1 = require("@steedos/metadata-core");
|
|
|
8
8
|
function authRequest(url, requestOptions, requestCallback) {
|
|
9
9
|
var metadataURL = (0, metadata_core_1.getMetaDataUrl)();
|
|
10
10
|
requestOptions.url = `${metadataURL}${url}`;
|
|
11
|
-
// requestOptions.form.space = getMetaDataSpaceId();
|
|
12
11
|
if (!_.has(requestOptions, 'headers')) {
|
|
13
12
|
requestOptions.headers = {};
|
|
14
13
|
}
|
package/dist/auth/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":";;;AAAA,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACnC,MAAM,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAChC,0DAAuK;AACvK,IAAA,uBAAO,GAAE,CAAC;AAEV,SAAgB,WAAW,CAAC,GAAW,EAAE,cAAc,EAAE,eAAe;IAEpE,IAAI,WAAW,GAAG,IAAA,8BAAc,GAAE,CAAC;IAEnC,cAAc,CAAC,GAAG,GAAG,GAAG,WAAW,GAAG,GAAG,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":";;;AAAA,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACnC,MAAM,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAChC,0DAAuK;AACvK,IAAA,uBAAO,GAAE,CAAC;AAEV,SAAgB,WAAW,CAAC,GAAW,EAAE,cAAc,EAAE,eAAe;IAEpE,IAAI,WAAW,GAAG,IAAA,8BAAc,GAAE,CAAC;IAEnC,cAAc,CAAC,GAAG,GAAG,GAAG,WAAW,GAAG,GAAG,EAAE,CAAA;IAI3C,IAAG,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,EAAE,SAAS,CAAC,EAAC;QACjC,cAAc,CAAC,OAAO,GAAG,EAAE,CAAC;KAC/B;IAED,IAAG,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,eAAe,CAAC,EAAC;QAC/C,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,IAAA,mCAAmB,GAAE,CAAC;KACnE;IACD,OAAO,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;AACpD,CAAC;AAhBD,kCAgBC"}
|
|
@@ -6,8 +6,6 @@ const metadata_core_1 = require("@steedos/metadata-core");
|
|
|
6
6
|
class LoginCommand extends loginOclif.Command {
|
|
7
7
|
async run() {
|
|
8
8
|
const { args, flags } = this.parse(LoginCommand);
|
|
9
|
-
// console.log('flags', flags);
|
|
10
|
-
// console.log('args', args);
|
|
11
9
|
var username = flags.username;
|
|
12
10
|
var password = flags.password;
|
|
13
11
|
if (!username) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":";;AAAA,MAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAC5C,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE7B,0DAAiD;AAEjD,MAAM,YAAa,SAAQ,UAAU,CAAC,OAAO;IACzC,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":";;AAAA,MAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAC5C,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE7B,0DAAiD;AAEjD,MAAM,YAAa,SAAQ,UAAU,CAAC,OAAO;IACzC,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAIjD,IAAI,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAA;QAC7B,IAAI,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAA;QAE7B,IAAG,CAAC,QAAQ,EAAC;YACT,OAAO,OAAO,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;SAC1D;QACD,IAAG,CAAC,QAAQ,EAAC;YACT,OAAO,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;SAC9D;QAED,IAAG;YACC,MAAM,IAAA,uBAAO,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;SACrC;QAAA,OAAM,KAAK,EAAC;YAET,IAAG,KAAK,CAAC,IAAI,IAAI,cAAc,EAAC;gBAC5B,OAAO,CAAC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;aAC5C;iBAAI;gBACD,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;aACpD;SACJ;IAEL,CAAC;CACJ;AAED,YAAY,CAAC,KAAK,GAAG;IACjB,QAAQ,EAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAC,CAAC;IACpE,QAAQ,EAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,UAAU,EAAC,CAAC;CAC3E,CAAA;AAED,MAAM,CAAC,OAAO,GAAG,YAAY,CAAA"}
|
|
@@ -28,7 +28,6 @@ class ExportCommand extends exportOclif.Command {
|
|
|
28
28
|
showLog,
|
|
29
29
|
};
|
|
30
30
|
exportDataFromServer(objectName, params, async function (res) {
|
|
31
|
-
// console.log(res);
|
|
32
31
|
if (doPlan) {
|
|
33
32
|
var parts = {};
|
|
34
33
|
var plans = [];
|
|
@@ -133,7 +132,6 @@ function exportDataFromServer(objectName, params, callback) {
|
|
|
133
132
|
recordsCount: params.recordsCount,
|
|
134
133
|
showLog: params.showLog,
|
|
135
134
|
},
|
|
136
|
-
// timeout: 2000
|
|
137
135
|
}, function (error, response, body) {
|
|
138
136
|
if (error) {
|
|
139
137
|
console.error('Error: ', error.message);
|
|
@@ -147,7 +145,6 @@ function exportDataFromServer(objectName, params, callback) {
|
|
|
147
145
|
}
|
|
148
146
|
}
|
|
149
147
|
else {
|
|
150
|
-
// var objects = JSON.stringify(body);
|
|
151
148
|
callback(body);
|
|
152
149
|
}
|
|
153
150
|
});
|
|
@@ -159,8 +156,6 @@ ExportCommand.flags = {
|
|
|
159
156
|
outputdir: exportOclif.flags.string({ char: 'd', description: 'Directory to store generated files.' }),
|
|
160
157
|
prefix: exportOclif.flags.string({ char: 'x', description: 'Prefix of generated files.' }),
|
|
161
158
|
plan: exportOclif.flags.boolean({ char: 'p', description: 'Generates multiple sObject tree files and a plan definition file for aggregated import.' }),
|
|
162
|
-
// recordsCount : exportOclif.flags.integer({char: 'c',description: 'records count.'}),
|
|
163
|
-
// showLog : exportOclif.flags.boolean({char: 'l',description: 'show log in server console.'}),
|
|
164
159
|
};
|
|
165
160
|
module.exports = ExportCommand;
|
|
166
161
|
//# sourceMappingURL=export.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../src/commands/data/export.ts"],"names":[],"mappings":";;AAAA,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE7C,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACzB,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAC/B,MAAM,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAEhC,qCAAyC;AACzC,4DAAuD;AAEvD,MAAM,aAAc,SAAQ,WAAW,CAAC,OAAO;IAC3C,KAAK,CAAC,GAAG;QACL,IAAG;YACC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAEjD,IAAI,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;YAClC,IAAI,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC;YACzB,IAAI,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC;YAE/B,IAAI,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YACjD,IAAI,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;YAC1B,IAAI,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC;YACxB,IAAI,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;YACtC,IAAI,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;YAE5B,IAAI,GAAG,GAAG,IAAA,2BAAW,EAAC,QAAQ,CAAC,CAAC;YAChC,IAAI,MAAM,GAAG,IAAA,2BAAW,EAAC,WAAW,CAAC,CAAC;YAEtC,IAAI,MAAM,GAAG;gBACT,GAAG;gBACH,MAAM;gBACN,YAAY;gBACZ,OAAO;aACV,CAAA;YACD,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,WAAU,GAAG;
|
|
1
|
+
{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../src/commands/data/export.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ const chalk = require('chalk');
|
|
|
7
7
|
const _ = require('underscore');
|
|
8
8
|
const auth_1 = require("../../auth");
|
|
9
9
|
const split_to_list_1 = require("../../util/split_to_list");
|
|
10
|
-
// import { Table } from '@steedos/metadata-core';
|
|
11
10
|
class ImportCommand extends importOclif.Command {
|
|
12
11
|
async run() {
|
|
13
12
|
try {
|
|
@@ -93,9 +92,7 @@ class ImportCommand extends importOclif.Command {
|
|
|
93
92
|
console.error(chalk.red('ERROR running data:import: ' + JSON.stringify(resJson)));
|
|
94
93
|
}
|
|
95
94
|
else {
|
|
96
|
-
//todo 优化成功时的控制台输出
|
|
97
95
|
console.log(resJson);
|
|
98
|
-
// const table = new Table().createTable(des.getFilesInfo(), cols, tableTitle);
|
|
99
96
|
}
|
|
100
97
|
});
|
|
101
98
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../src/commands/data/import.ts"],"names":[],"mappings":";;AAAA,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE7C,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACzB,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAC/B,MAAM,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAEhC,qCAAyC;AACzC,4DAAuD;
|
|
1
|
+
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../src/commands/data/import.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/i18n.js
CHANGED
|
@@ -6,8 +6,6 @@ const path = require("path");
|
|
|
6
6
|
class I18nCommand extends Command {
|
|
7
7
|
async run() {
|
|
8
8
|
const { args, flags } = this.parse(I18nCommand);
|
|
9
|
-
// console.log('flags', flags);
|
|
10
|
-
// console.log('args', args);
|
|
11
9
|
let lng = args.name;
|
|
12
10
|
let serverDir = flags.serverDir || process.cwd();
|
|
13
11
|
let packageDir = flags.packageDir || serverDir;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../../src/commands/i18n.ts"],"names":[],"mappings":";;AAAA,MAAM,EAAC,OAAO,EAAE,KAAK,EAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAClD,yCAAsC;AACtC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE7B,MAAM,WAAY,SAAQ,OAAO;IAC/B,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../../src/commands/i18n.ts"],"names":[],"mappings":";;AAAA,MAAM,EAAC,OAAO,EAAE,KAAK,EAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAClD,yCAAsC;AACtC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE7B,MAAM,WAAY,SAAQ,OAAO;IAC/B,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAG/C,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC;QACpB,IAAI,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACjD,IAAI,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,SAAS,CAAC;QAC9C,MAAc,CAAC,MAAM,GAAG,EAAE,CAAC;QAC5B,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzB,IAAA,gBAAQ,EAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAC5B,CAAC;CACF;AAED,WAAW,CAAC,IAAI,GAAG;IAClB;QACC,IAAI,EAAS,MAAM;QACnB,QAAQ,EAAK,IAAI;QACjB,WAAW,EAAE,UAAU;KACvB;CACD,CAAC;AAEF,WAAW,CAAC,WAAW,GAAG,qBAAqB,CAAA;AAE/C,WAAW,CAAC,KAAK,GAAG;IAChB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,oBAAoB,EAAC,CAAC;IACvE,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,qBAAqB,EAAC,CAAC;CAC5E,CAAA;AAED,MAAM,CAAC,OAAO,GAAG,WAAW,CAAA"}
|
|
@@ -13,8 +13,6 @@ class CompressCommand extends compressOclif.Command {
|
|
|
13
13
|
async run() {
|
|
14
14
|
try {
|
|
15
15
|
const { args, flags } = this.parse(CompressCommand);
|
|
16
|
-
// console.log('flags', flags);
|
|
17
|
-
// console.log('args', args);
|
|
18
16
|
var sourcePath = flags.appPath;
|
|
19
17
|
var cwdPath = process.cwd();
|
|
20
18
|
if (!path.isAbsolute(sourcePath)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/commands/package/build.ts"],"names":[],"mappings":";;AAAA,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE/C,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACzB,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE7B,0DAC2F;AAG3F,MAAM,SAAS,GAAI;IACf,KAAK,EAAC,CAAC;IACP,IAAI,EAAC,CAAC;IACN,IAAI,EAAC,CAAC;CACT,CAAA;AACD,MAAM,eAAgB,SAAQ,aAAa,CAAC,OAAO;IAC/C,KAAK,CAAC,GAAG;QACL,IAAG;YAEC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/commands/package/build.ts"],"names":[],"mappings":";;AAAA,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE/C,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACzB,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE7B,0DAC2F;AAG3F,MAAM,SAAS,GAAI;IACf,KAAK,EAAC,CAAC;IACP,IAAI,EAAC,CAAC;IACN,IAAI,EAAC,CAAC;CACT,CAAA;AACD,MAAM,eAAgB,SAAQ,aAAa,CAAC,OAAO;IAC/C,KAAK,CAAC,GAAG;QACL,IAAG;YAEC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YAIpD,IAAI,UAAU,GAAG,KAAK,CAAC,OAAO,CAAA;YAC9B,IAAI,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;YAC5B,IAAG,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAC;gBAC5B,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;aAC/C;YACD,IAAI,WAAW,GAAG,KAAK,CAAC,WAAW,CAAA;YACnC,IAAI,OAAO,GAAG,IAAA,4BAAY,EAAC,WAAW,CAAC,CAAC;YACxC,IAAI,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;YAC9B,IAAG,CAAC,QAAQ,EAAC;gBACT,QAAQ,GAAG,MAAM,CAAA;aACpB;YACD,IAAI,OAAO,GAAG,KAAK,CAAC;YACpB,IAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAC;gBACvB,OAAO,GAAG,IAAI,CAAC;aAClB;YAED,IAAI,MAAM,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,uCAAuC,EAAC,aAAa,EAAC,0CAA0C,EAAE,OAAO,EAAE,OAAO,EAAC,CAAC;YAChK,MAAM,IAAI,GAAG;gBACT,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;gBAC9B,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE;aACzC,CAAC;YACF,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;YAEtB,IAAI,WAAW,GAAG,IAAA,sCAAsB,EAAC,UAAU,CAAC,CAAC;YAErD,IAAG,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;aAChD;YAED,IAAA,6BAAa,EAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,WAAU,MAAM;gBAExE,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;gBACjD,IAAG,CAAC,WAAW,EAAC;oBACZ,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;iBAC3C;gBACD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,GAAC,UAAU,CAAC,EAAE,UAAU,CAAC,CAAC;gBACzE,OAAO,CAAC,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,GAAC,UAAU,CAAC,CAAC,CAAC;gBACnF,IAAA,qCAAqB,EAAC,OAAO,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;SACN;QAAA,OAAM,KAAK,EAAC;YACT,OAAO,CAAC,KAAK,CAAC,SAAS,GAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC1C;IACL,CAAC;CACJ;AAED,eAAe,CAAC,KAAK,GAAG;IACpB,OAAO,EAAG,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;IACzF,WAAW,EAAG,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,cAAc,EAAC,CAAC;IAClF,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,8EAA8E,EAAC,CAAC;CACjJ,CAAA;AAED,MAAM,CAAC,OAAO,GAAG,eAAe,CAAA"}
|
|
@@ -7,8 +7,6 @@ const metadata_core_1 = require("@steedos/metadata-core");
|
|
|
7
7
|
class ConfigCommand extends confOclif.Command {
|
|
8
8
|
async run() {
|
|
9
9
|
const { args, flags } = this.parse(ConfigCommand);
|
|
10
|
-
// console.log('flags', flags);
|
|
11
|
-
// console.log('args', args);
|
|
12
10
|
var rooturl = (0, metadata_core_1.getRootUrl)();
|
|
13
11
|
if (!rooturl) {
|
|
14
12
|
rooturl = process.env.ROOT_URL;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/commands/source/config.ts"],"names":[],"mappings":";;AAAA,MAAM,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE3C,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AACpC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/B,0DAAsF;AAEtF,MAAM,aAAc,SAAQ,SAAS,CAAC,OAAO;IACzC,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/commands/source/config.ts"],"names":[],"mappings":";;AAAA,MAAM,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE3C,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AACpC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/B,0DAAsF;AAEtF,MAAM,aAAc,SAAQ,SAAS,CAAC,OAAO;IACzC,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAIlD,IAAI,OAAO,GAAG,IAAA,0BAAU,GAAE,CAAC;QAC3B,IAAG,CAAC,OAAO,EAAC;YACR,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAA;SACjC;QACD,IAAG,CAAC,OAAO,EAAC;YACR,OAAO,GAAG,uBAAuB,CAAA;SACpC;QACD,IAAI,MAAM,GAAG,EAAE,CAAC,QAAQ,CAAC,oBAAoB,OAAO,GAAG,CAAC,CAAC;QACzD,IAAI,MAAM,GAAG,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QAE9C,IAAG,MAAM,IAAI,EAAE,EAAC;YACZ,MAAM,GAAG,OAAO,CAAA;SACnB;QAED,IAAG,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,EAAC;YAC1B,MAAM,GAAG,UAAU,MAAM,EAAE,CAAA;SAC9B;QACD,IAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAC;YACpB,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAC,CAAC,CAAC,CAAC;SACjD;QAED,IAAI,YAAY,GAAG,IAAA,+BAAe,GAAE,CAAA;QACpC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,oBAAoB,GAAG,YAAY,CAAC,GAAG,GAAG,CAAC,CAAC;QACrE,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAC,MAAM,CAAC,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAC,MAAM,CAAC,CAAC;QACvC,IAAI,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;QAEhD,IAAG,IAAI,IAAI,EAAE,IAAI,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,EAAC;YAEvC,IAAG;gBACC,IAAI,MAAM,GAAG,EAAC,MAAM,EAAE,MAAM,EAAC,CAAA;gBAC7B,IAAA,gCAAgB,EAAC,MAAM,CAAC,CAAC;aAC5B;YAAA,OAAM,KAAK,EAAC;gBACT,OAAO,CAAC,KAAK,CAAC,SAAS,GAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aAC1C;SACJ;IAEL,CAAC;CACJ;AAED,MAAM,CAAC,OAAO,GAAG,aAAa,CAAA"}
|
|
@@ -8,16 +8,11 @@ const metadata_core_1 = require("@steedos/metadata-core");
|
|
|
8
8
|
class ConvertCommand extends convertOclif.Command {
|
|
9
9
|
async run() {
|
|
10
10
|
const { args, flags } = this.parse(ConvertCommand);
|
|
11
|
-
// console.log('flags', flags);
|
|
12
|
-
// console.log('args', args);
|
|
13
11
|
var oldFilesPath = flags.oldFilesPath;
|
|
14
12
|
var targetPath = flags.targetPath;
|
|
15
13
|
if (!oldFilesPath) {
|
|
16
14
|
throw new Error('需要传入老文件路径,参数-o');
|
|
17
15
|
}
|
|
18
|
-
// if(!targetPath){
|
|
19
|
-
// throw new Error('需要传入新文件生成的绝对路径,参数-t')
|
|
20
|
-
// }
|
|
21
16
|
let steedosPackageJson = await (0, loadfiletojson_1.loadOldFileToJson)(oldFilesPath);
|
|
22
17
|
if (!targetPath) {
|
|
23
18
|
targetPath = oldFilesPath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../../src/commands/source/convert.ts"],"names":[],"mappings":";;AAAA,MAAM,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAC9C,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE7B,kEAAkE;AAClE,wEAAsE;AAEtE,0DAAkD;AAElD,MAAM,cAAe,SAAQ,YAAY,CAAC,OAAO;IAC7C,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../../src/commands/source/convert.ts"],"names":[],"mappings":";;AAAA,MAAM,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAC9C,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE7B,kEAAkE;AAClE,wEAAsE;AAEtE,0DAAkD;AAElD,MAAM,cAAe,SAAQ,YAAY,CAAC,OAAO;IAC7C,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAInD,IAAI,YAAY,GAAG,KAAK,CAAC,YAAY,CAAA;QACrC,IAAI,UAAU,GAAG,KAAK,CAAC,UAAU,CAAA;QAEjC,IAAG,CAAC,YAAY,EAAC;YACb,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAA;SACpC;QAID,IAAI,kBAAkB,GAAG,MAAM,IAAA,kCAAiB,EAAC,YAAY,CAAC,CAAC;QAC/D,IAAG,CAAC,UAAU,EAAC;YACX,UAAU,GAAG,YAAY,CAAA;YACzB,UAAU,GAAG,IAAI,CAAC,IAAI,CAAE,UAAU,EAAE,IAAI,CAAC,CAAC;SAC7C;QACD,IAAG,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;SACxC;QAED,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACtD,IAAA,0BAAU,EAAC,UAAU,CAAC,CAAC;QACvB,MAAM,IAAA,8BAAgB,EAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC;IAC3D,CAAC;CACJ;AAED,cAAc,CAAC,KAAK,GAAG;IACnB,YAAY,EAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;IAClG,UAAU,EAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;CACjG,CAAA;AAED,MAAM,CAAC,OAAO,GAAG,cAAc,CAAA"}
|
|
@@ -18,7 +18,7 @@ class DeployCommand extends depOclif.Command {
|
|
|
18
18
|
if (!is_directory) {
|
|
19
19
|
sourcePath = path.join(sourcePath, '..');
|
|
20
20
|
}
|
|
21
|
-
process.chdir(sourcePath);
|
|
21
|
+
process.chdir(sourcePath);
|
|
22
22
|
sourcePath = process.cwd();
|
|
23
23
|
if (!is_directory) {
|
|
24
24
|
sourcePath = path.join(sourcePath, baseName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/commands/source/deploy.ts"],"names":[],"mappings":";;AAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE1C,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACzB,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACzB,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,qDAAwD;AAExD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/B,0DAGgC;AAChC,MAAM,aAAc,SAAQ,QAAQ,CAAC,OAAO;IACxC,KAAK,CAAC,GAAG;QACL,IAAI;YACA,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAElD,IAAI,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YACnD,IAAI,IAAI,GAAG,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YACpC,IAAI,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YAEtC,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YACzC,IAAI,CAAC,YAAY,EAAE;gBACf,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;aAC5C;YAED,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/commands/source/deploy.ts"],"names":[],"mappings":";;AAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE1C,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACzB,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACzB,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,qDAAwD;AAExD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/B,0DAGgC;AAChC,MAAM,aAAc,SAAQ,QAAQ,CAAC,OAAO;IACxC,KAAK,CAAC,GAAG;QACL,IAAI;YACA,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAElD,IAAI,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YACnD,IAAI,IAAI,GAAG,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YACpC,IAAI,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YAEtC,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YACzC,IAAI,CAAC,YAAY,EAAE;gBACf,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;aAC5C;YAED,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC1B,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;YAE1B,IAAI,CAAC,YAAY,EAAE;gBACf,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;aAC/C;YAED,IAAI,OAAO,GAAG,IAAA,4BAAY,EAAC,SAAS,CAAC,CAAC;YAEtC,IAAI,MAAM,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YAE/F,MAAM,WAAW,GAAG,IAAA,sCAAsB,EAAC,UAAU,CAAC,CAAC;YACvD,MAAM,WAAW,GAAG,IAAA,8BAAc,EAAC,UAAU,CAAC,CAAC;YAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;YAEpD,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;YAE/D,IAAI,OAAO,GAAG,UAAU,CAAC;YACzB,IAAI,OAAO,CAAC;YAEZ,IAAI,OAAO,GAAG,KAAK,CAAC;YACpB,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,OAAO,CAAC,OAAO,EAAE;gBACb,IAAI,OAAO,KAAK,kBAAkB,IAAI,KAAK,EAAE,IAAI,EAAE,EAAE;oBACjD,MAAM;iBACT;gBACD,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBACtC,IAAI,OAAO,IAAI,OAAO,EAAE;oBACpB,MAAM,IAAI,KAAK,CAAC,8FAA8F,CAAC,CAAC;iBACnH;gBACD,OAAO,GAAG,OAAO,CAAC;aACrB;YAED,IAAA,6BAAa,EAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,WAAW,MAAM,EAAE,MAAM;gBAC9E,MAAM,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC;gBAC3B,IAAA,qCAAqB,EAAC,OAAO,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;SAGN;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACjB,MAAM,GAAG,CAAC;SACb;IACL,CAAC;CACJ;AAED,aAAa,CAAC,KAAK,GAAG;IAClB,UAAU,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,oDAAoD,EAAE,CAAC;CACtH,CAAA;AAED,aAAa,CAAC,WAAW;IACrB,yEAAyE;UACvE,8EAA8E;UAC9E,IAAI;UACJ,6EAA6E;UAC7E,uFAAuF;UACvF,IAAI;UACJ,aAAa;UACb,IAAI;UACJ,8CAA8C;UAC9C,iDAAiD;UACjD,sFAAsF;UACtF,+EAA+E;UAC/E,OAAO;UACP,qEAAqE;UACrE,IAAI,CAAA;AAEV,MAAM,CAAC,OAAO,GAAG,aAAa,CAAA"}
|
|
@@ -18,16 +18,13 @@ class RetrieveCommand extends retOclif.Command {
|
|
|
18
18
|
const projectPath = (0, metadata_core_1.resolveProjectPathSync)(serverDir);
|
|
19
19
|
const packagePath = (0, metadata_core_1.getPackagePath)(serverDir);
|
|
20
20
|
const appPath = path.join(projectPath, packagePath);
|
|
21
|
-
//retrieve -p
|
|
22
21
|
let is_directory = false;
|
|
23
22
|
if (flags.serverDir) {
|
|
24
23
|
const stat = fs.lstatSync(flags.serverDir);
|
|
25
24
|
is_directory = stat.isDirectory();
|
|
26
25
|
}
|
|
27
26
|
if (!ymlDir && flags.serverDir && is_directory) {
|
|
28
|
-
//getPackageYml 返回了所有源数据明细
|
|
29
27
|
var packageJson = (0, metadata_core_1.getPackageYml)(appPath, serverDir, { includeJs: false });
|
|
30
|
-
//如果是源数据的parent是object，则取*
|
|
31
28
|
for (const metadataName in packageJson) {
|
|
32
29
|
if ((0, metadata_core_1.hasParent)(metadataName)) {
|
|
33
30
|
var parentMetadataName = (0, metadata_core_1.getParentMetadataName)(metadataName);
|
|
@@ -42,26 +39,16 @@ class RetrieveCommand extends retOclif.Command {
|
|
|
42
39
|
packageJson[metadataName] = _.uniq(info);
|
|
43
40
|
}
|
|
44
41
|
}
|
|
45
|
-
// else if(metadataName === TypeInfoKeys.Object){
|
|
46
|
-
// const info: any = [];
|
|
47
|
-
// _.map(packageJson[metadataName], (objectApiName)=>{
|
|
48
|
-
// info.push(`${objectApiName}.*`)
|
|
49
|
-
// })
|
|
50
|
-
// packageJson[metadataName] = _.uniq(info)
|
|
51
|
-
// }
|
|
52
42
|
}
|
|
53
43
|
var packageYml = yaml.dump(packageJson);
|
|
54
44
|
var ymlBuffer = Buffer.from(packageYml);
|
|
55
45
|
requestYmlBase64 = ymlBuffer.toString('base64');
|
|
56
|
-
// fs.writeFileSync("F:/package.yml", packageYml);
|
|
57
46
|
}
|
|
58
47
|
else {
|
|
59
48
|
var options = { packageYmlDir: ymlDir, metadata, serverDir };
|
|
60
49
|
requestYmlBase64 = (0, metadata_core_1.getRetrievePackageInfo)(options);
|
|
61
|
-
// fs.writeFileSync("F:/package.yml", Buffer.from(requestYmlBase64, 'base64'));
|
|
62
50
|
}
|
|
63
51
|
(0, index_1.getFromServer)(requestYmlBase64, async function (zipBuffer) {
|
|
64
|
-
// 解压以后根据配置文件部署到相应位置
|
|
65
52
|
await (0, metadata_core_1.decompressAndDeploy)(zipBuffer, appPath);
|
|
66
53
|
});
|
|
67
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retrieve.js","sourceRoot":"","sources":["../../../src/commands/source/retrieve.ts"],"names":[],"mappings":";;AAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE1C,MAAM,KAAK,GAAE,OAAO,CAAC,OAAO,CAAC,CAAC;AAC9B,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACzB,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAChC,MAAM,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAEhC,uDAA2D;AAE3D,0DAAoP;AAGpP,MAAM,eAAgB,SAAQ,QAAQ,CAAC,OAAO;IAC1C,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACpD,IAAI,gBAAgB,CAAC;QAErB,IAAI,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAA;QAC3B,IAAI,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAA;QAC7B,IAAI,SAAS,GAAG,KAAK,CAAC,SAAS,IAAE,OAAO,CAAC,GAAG,EAAE,CAAC;QAE/C,MAAM,WAAW,GAAG,IAAA,sCAAsB,EAAC,SAAS,CAAC,CAAC;QACtD,MAAM,WAAW,GAAG,IAAA,8BAAc,EAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"retrieve.js","sourceRoot":"","sources":["../../../src/commands/source/retrieve.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/start.js
CHANGED
|
@@ -50,11 +50,6 @@ const stopSignals = [
|
|
|
50
50
|
"SIGUSR2",
|
|
51
51
|
"SIGTERM"
|
|
52
52
|
];
|
|
53
|
-
/* eslint-disable no-console */
|
|
54
|
-
/**
|
|
55
|
-
* Logger helper
|
|
56
|
-
*
|
|
57
|
-
*/
|
|
58
53
|
const logger = {
|
|
59
54
|
info(message) {
|
|
60
55
|
console.log(kleur_1.default.grey("[Runner]"), kleur_1.default.green().bold(message));
|
|
@@ -67,9 +62,6 @@ const logger = {
|
|
|
67
62
|
}
|
|
68
63
|
};
|
|
69
64
|
class StartCommand extends Command {
|
|
70
|
-
/**
|
|
71
|
-
* Load environment variables from '.env' file
|
|
72
|
-
*/
|
|
73
65
|
async loadEnvFile() {
|
|
74
66
|
if (this.flags.env || this.flags.envfile) {
|
|
75
67
|
try {
|
|
@@ -84,33 +76,14 @@ class StartCommand extends Command {
|
|
|
84
76
|
}
|
|
85
77
|
}
|
|
86
78
|
}
|
|
87
|
-
/**
|
|
88
|
-
* Fix Uppercase drive letter issue on Windows. It causes problem on custom modules detection (XY instanceof Base)
|
|
89
|
-
* Unused currently, because it causes problem: https://github.com/moleculerjs/moleculer/issues/788
|
|
90
|
-
*
|
|
91
|
-
* More info: https://github.com/nodejs/node/issues/6978
|
|
92
|
-
* @param {String} s
|
|
93
|
-
* @returns {String}
|
|
94
|
-
*/
|
|
95
79
|
fixDriveLetterCase(s) {
|
|
96
80
|
if (s && process.platform === "win32" && s.match(/^[A-Z]:/g)) {
|
|
97
81
|
return s.charAt(0).toLowerCase() + s.slice(1);
|
|
98
82
|
}
|
|
99
83
|
return s;
|
|
100
84
|
}
|
|
101
|
-
/**
|
|
102
|
-
* Load configuration file
|
|
103
|
-
*
|
|
104
|
-
* Try to load a configuration file in order to:
|
|
105
|
-
*
|
|
106
|
-
* - load file defined in MOLECULER_CONFIG env var
|
|
107
|
-
* - try to load file which is defined in CLI option with --config
|
|
108
|
-
* - try to load the `moleculer.config.js` file if exist in the cwd
|
|
109
|
-
* - try to load the `moleculer.config.json` file if exist in the cwd
|
|
110
|
-
*/
|
|
111
85
|
async loadConfigFile() {
|
|
112
86
|
let filePath;
|
|
113
|
-
// Env vars have priority over the flags
|
|
114
87
|
if (process.env["MOLECULER_CONFIG"]) {
|
|
115
88
|
filePath = path.isAbsolute(process.env["MOLECULER_CONFIG"])
|
|
116
89
|
? process.env["MOLECULER_CONFIG"]
|
|
@@ -142,9 +115,7 @@ class StartCommand extends Command {
|
|
|
142
115
|
case ".js":
|
|
143
116
|
case ".mjs":
|
|
144
117
|
case ".ts": {
|
|
145
|
-
// const mod = await import(filePath.startsWith("/") ? filePath : "/" + filePath);
|
|
146
118
|
let content = require(filePath);
|
|
147
|
-
// let content = mod.default;
|
|
148
119
|
if (moleculer_1.Utils.isFunction(content))
|
|
149
120
|
content = await content.call(this);
|
|
150
121
|
this.configFile = await start_1.Start.mergeConfig(content);
|
|
@@ -158,11 +129,9 @@ class StartCommand extends Command {
|
|
|
158
129
|
}
|
|
159
130
|
normalizeEnvValue(value) {
|
|
160
131
|
if (value.toLowerCase() === "true" || value.toLowerCase() === "false") {
|
|
161
|
-
// Convert to boolean
|
|
162
132
|
value = value === "true";
|
|
163
133
|
}
|
|
164
134
|
else if (!isNaN(value)) {
|
|
165
|
-
// Convert to number
|
|
166
135
|
value = Number(value);
|
|
167
136
|
}
|
|
168
137
|
return value;
|
|
@@ -176,7 +145,6 @@ class StartCommand extends Command {
|
|
|
176
145
|
if (moleculer_1.Utils.isPlainObject(obj[key]))
|
|
177
146
|
obj[key] = this.overwriteFromEnv(obj[key], (prefix ? prefix + "_" : "") + key);
|
|
178
147
|
});
|
|
179
|
-
// Process MOL_ env vars only the root level
|
|
180
148
|
if (prefix == null) {
|
|
181
149
|
const moleculerPrefix = "MOL_";
|
|
182
150
|
Object.keys(process.env)
|
|
@@ -206,24 +174,6 @@ class StartCommand extends Command {
|
|
|
206
174
|
}
|
|
207
175
|
return obj;
|
|
208
176
|
}
|
|
209
|
-
/**
|
|
210
|
-
* Merge broker options
|
|
211
|
-
*
|
|
212
|
-
* Merge options from environment variables and config file. First
|
|
213
|
-
* load the config file if exists. After it overwrite the vars from
|
|
214
|
-
* the environment values.
|
|
215
|
-
*
|
|
216
|
-
* Example options:
|
|
217
|
-
*
|
|
218
|
-
* Original broker option: `logLevel`
|
|
219
|
-
* Config file property: `logLevel`
|
|
220
|
-
* Env variable: `LOGLEVEL`
|
|
221
|
-
*
|
|
222
|
-
* Original broker option: `circuitBreaker.enabled`
|
|
223
|
-
* Config file property: `circuitBreaker.enabled`
|
|
224
|
-
* Env variable: `CIRCUITBREAKER_ENABLED`
|
|
225
|
-
*
|
|
226
|
-
*/
|
|
227
177
|
mergeOptions() {
|
|
228
178
|
this.config = lodash_1.default.defaultsDeep(this.configFile, moleculer_1.ServiceBroker.defaultOptions);
|
|
229
179
|
this.config = this.overwriteFromEnv(this.config);
|
|
@@ -231,55 +181,23 @@ class StartCommand extends Command {
|
|
|
231
181
|
this.config.logger = false;
|
|
232
182
|
if (this.flags.hot)
|
|
233
183
|
this.config.hotReload = true;
|
|
234
|
-
// console.log("Merged configuration", this.config);
|
|
235
184
|
}
|
|
236
|
-
/**
|
|
237
|
-
* Check the given path whether directory or not
|
|
238
|
-
*
|
|
239
|
-
* @param {String} p
|
|
240
|
-
* @returns {Boolean}
|
|
241
|
-
*/
|
|
242
185
|
isDirectory(p) {
|
|
243
186
|
try {
|
|
244
187
|
return fs_1.default.lstatSync(p).isDirectory();
|
|
245
188
|
}
|
|
246
189
|
catch (_) {
|
|
247
|
-
// ignore
|
|
248
190
|
}
|
|
249
191
|
return false;
|
|
250
192
|
}
|
|
251
|
-
/**
|
|
252
|
-
* Check the given path whether a file or not
|
|
253
|
-
*
|
|
254
|
-
* @param {String} p
|
|
255
|
-
* @returns {Boolean}
|
|
256
|
-
*/
|
|
257
193
|
isServiceFile(p) {
|
|
258
194
|
try {
|
|
259
195
|
return !fs_1.default.lstatSync(p).isDirectory();
|
|
260
196
|
}
|
|
261
197
|
catch (_) {
|
|
262
|
-
// ignore
|
|
263
198
|
}
|
|
264
199
|
return false;
|
|
265
200
|
}
|
|
266
|
-
/**
|
|
267
|
-
* Load services from files or directories
|
|
268
|
-
*
|
|
269
|
-
* 1. If find `SERVICEDIR` env var and not find `SERVICES` env var, load all services from the `SERVICEDIR` directory
|
|
270
|
-
* 2. If find `SERVICEDIR` env var and `SERVICES` env var, load the specified services from the `SERVICEDIR` directory
|
|
271
|
-
* 3. If not find `SERVICEDIR` env var but find `SERVICES` env var, load the specified services from the current directory
|
|
272
|
-
* 4. check the CLI arguments. If it find filename(s), load it/them
|
|
273
|
-
* 5. If find directory(ies), load it/them
|
|
274
|
-
*
|
|
275
|
-
* Please note: you can use shorthand names for `SERVICES` env var.
|
|
276
|
-
* E.g.
|
|
277
|
-
* SERVICES=posts,users
|
|
278
|
-
*
|
|
279
|
-
* It will be load the `posts.service.js` and `users.service.js` files
|
|
280
|
-
*
|
|
281
|
-
*
|
|
282
|
-
*/
|
|
283
201
|
async loadServices() {
|
|
284
202
|
this.watchFolders.length = 0;
|
|
285
203
|
const fileMask = this.flags.mask || "**/*.service.js";
|
|
@@ -290,14 +208,12 @@ class StartCommand extends Command {
|
|
|
290
208
|
let patterns = this.servicePaths;
|
|
291
209
|
if (process.env.SERVICES || process.env.SERVICEDIR) {
|
|
292
210
|
if (this.isDirectory(svcDir) && !process.env.SERVICES) {
|
|
293
|
-
// Load all services from directory (from subfolders too)
|
|
294
211
|
this.broker.loadServices(svcDir, fileMask);
|
|
295
212
|
if (this.config.hotReload) {
|
|
296
213
|
this.watchFolders.push(svcDir);
|
|
297
214
|
}
|
|
298
215
|
}
|
|
299
216
|
else if (process.env.SERVICES) {
|
|
300
|
-
// Load services from env list
|
|
301
217
|
patterns = Array.isArray(process.env.SERVICES)
|
|
302
218
|
? process.env.SERVICES
|
|
303
219
|
: process.env.SERVICES.split(",");
|
|
@@ -313,7 +229,6 @@ class StartCommand extends Command {
|
|
|
313
229
|
p = p.slice(1);
|
|
314
230
|
let files;
|
|
315
231
|
const svcPath = path.isAbsolute(p) ? p : path.resolve(svcDir, p);
|
|
316
|
-
// Check is it a directory?
|
|
317
232
|
if (this.isDirectory(svcPath)) {
|
|
318
233
|
if (this.config.hotReload) {
|
|
319
234
|
this.watchFolders.push(svcPath);
|
|
@@ -331,7 +246,6 @@ class StartCommand extends Command {
|
|
|
331
246
|
files = [svcPath.replace(/\\/g, "/") + ".service.js"];
|
|
332
247
|
}
|
|
333
248
|
else {
|
|
334
|
-
// Load with glob
|
|
335
249
|
files = glob_1.default.sync(p, { cwd: svcDir, absolute: true });
|
|
336
250
|
if (files.length == 0)
|
|
337
251
|
this.broker.logger.warn(kleur_1.default
|
|
@@ -353,14 +267,10 @@ class StartCommand extends Command {
|
|
|
353
267
|
}));
|
|
354
268
|
}
|
|
355
269
|
}
|
|
356
|
-
/**
|
|
357
|
-
* Start cluster workers
|
|
358
|
-
*/
|
|
359
270
|
startWorkers(instances) {
|
|
360
271
|
let stopping = false;
|
|
361
272
|
cluster_1.default.on("exit", function (worker, code) {
|
|
362
273
|
if (!stopping) {
|
|
363
|
-
// only restart the worker if the exit was by an error
|
|
364
274
|
if (process.env.NODE_ENV === "production" && code !== 0) {
|
|
365
275
|
logger.info(`The worker #${worker.id} has disconnected`);
|
|
366
276
|
logger.info(`Worker #${worker.id} restarting...`);
|
|
@@ -388,9 +298,6 @@ class StartCommand extends Command {
|
|
|
388
298
|
});
|
|
389
299
|
});
|
|
390
300
|
}
|
|
391
|
-
/**
|
|
392
|
-
* Start Moleculer broker
|
|
393
|
-
*/
|
|
394
301
|
async startBroker() {
|
|
395
302
|
this.worker = cluster_1.default.worker;
|
|
396
303
|
if (this.worker) {
|
|
@@ -398,7 +305,6 @@ class StartCommand extends Command {
|
|
|
398
305
|
nodeID: (this.config.nodeID || moleculer_1.Utils.getNodeID()) + "-" + this.worker.id
|
|
399
306
|
});
|
|
400
307
|
}
|
|
401
|
-
// Create service broker
|
|
402
308
|
this.broker = new moleculer_1.ServiceBroker(Object.assign({}, this.config));
|
|
403
309
|
this.broker.runner = this;
|
|
404
310
|
await this.loadServices();
|
|
@@ -410,12 +316,8 @@ class StartCommand extends Command {
|
|
|
410
316
|
return this.broker;
|
|
411
317
|
});
|
|
412
318
|
}
|
|
413
|
-
/**
|
|
414
|
-
* Running
|
|
415
|
-
*/
|
|
416
319
|
_runMoleculer() {
|
|
417
320
|
return Promise.resolve()
|
|
418
|
-
// .then(() => this.loadEnvFile())
|
|
419
321
|
.then(() => this.loadConfigFile())
|
|
420
322
|
.then(() => this.mergeOptions())
|
|
421
323
|
.then(() => this.startBroker())
|
|
@@ -449,7 +351,6 @@ class StartCommand extends Command {
|
|
|
449
351
|
this.worker = null;
|
|
450
352
|
this.flags = flags;
|
|
451
353
|
this.servicePaths = lodash_1.default.compact(Object.values(args));
|
|
452
|
-
process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = "https://unpkg.com/@steedos-ui/builder-widgets@2.2.37/dist/assets.json";
|
|
453
354
|
if (this.flags.instances !== undefined && cluster_1.default.isMaster) {
|
|
454
355
|
this.instances = Number.parseInt(this.flags.instances) ? Number.parseInt(this.flags.instances) : 'max';
|
|
455
356
|
return this.startWorkers(this.instances);
|