@steedos/metadata-core 3.0.0-beta.98 → 3.0.0
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/lib/project/index.js +19 -17
- package/lib/project/index.js.map +1 -1
- package/package.json +3 -4
package/lib/project/index.js
CHANGED
|
@@ -42,21 +42,22 @@ exports.scanPackages = scanPackages;
|
|
|
42
42
|
exports.uncompressPackages = uncompressPackages;
|
|
43
43
|
exports.getPackages = getPackages;
|
|
44
44
|
const path = __importStar(require("path"));
|
|
45
|
-
const fs = require(
|
|
46
|
-
const glob = require(
|
|
45
|
+
const fs = require("fs");
|
|
46
|
+
const glob = require("glob");
|
|
47
47
|
const compressing = require("compressing");
|
|
48
|
-
const mkdirp = require(
|
|
48
|
+
const mkdirp = require("mkdirp");
|
|
49
49
|
const folderUtil_1 = require("../folderUtil");
|
|
50
|
-
const STEEDOS_PROJECT_JSON =
|
|
51
|
-
const STEEDOS_PROJECT_JS =
|
|
52
|
-
const STEEDOS_PACKAGE_FOLDER_NAME =
|
|
53
|
-
const STEEDOS_SERVICE_FOLDER_NAME =
|
|
50
|
+
const STEEDOS_PROJECT_JSON = "steedos-config.yml";
|
|
51
|
+
const STEEDOS_PROJECT_JS = "steedos.config.js";
|
|
52
|
+
const STEEDOS_PACKAGE_FOLDER_NAME = "steedos-packages";
|
|
53
|
+
const STEEDOS_SERVICE_FOLDER_NAME = "services";
|
|
54
54
|
function traverseForFileSync(dir, file, file2) {
|
|
55
55
|
let foundProjectDir = null;
|
|
56
56
|
let nowDir = dir;
|
|
57
57
|
let nextDir = null;
|
|
58
|
-
while (!fs.existsSync(path.join(nowDir, file)) &&
|
|
59
|
-
|
|
58
|
+
while (!fs.existsSync(path.join(nowDir, file)) &&
|
|
59
|
+
!fs.existsSync(path.join(nowDir, file2))) {
|
|
60
|
+
nextDir = path.resolve(nowDir, "..");
|
|
60
61
|
if (nextDir == nowDir) {
|
|
61
62
|
break;
|
|
62
63
|
}
|
|
@@ -68,7 +69,7 @@ function traverseForFileSync(dir, file, file2) {
|
|
|
68
69
|
function resolveProjectPathSync(dir = process.cwd()) {
|
|
69
70
|
let projectPath = traverseForFileSync(dir, STEEDOS_PROJECT_JSON, STEEDOS_PROJECT_JS);
|
|
70
71
|
if (!projectPath) {
|
|
71
|
-
throw new Error(
|
|
72
|
+
throw new Error("InvalidProjectWorkspace");
|
|
72
73
|
}
|
|
73
74
|
return projectPath;
|
|
74
75
|
}
|
|
@@ -76,8 +77,9 @@ function traverseForAppSync(dir, file, file2) {
|
|
|
76
77
|
let foundAppDir = null;
|
|
77
78
|
let nowDir = dir;
|
|
78
79
|
let nextDir = null;
|
|
79
|
-
while (!fs.existsSync(path.join(nowDir,
|
|
80
|
-
|
|
80
|
+
while (!fs.existsSync(path.join(nowDir, "..", file)) &&
|
|
81
|
+
!fs.existsSync(path.join(nowDir, "..", file2))) {
|
|
82
|
+
nextDir = path.resolve(nowDir, "..");
|
|
81
83
|
if (nextDir == nowDir) {
|
|
82
84
|
break;
|
|
83
85
|
}
|
|
@@ -89,7 +91,7 @@ function traverseForAppSync(dir, file, file2) {
|
|
|
89
91
|
function resolveAppNameSync(dir = process.cwd()) {
|
|
90
92
|
let appPath = traverseForAppSync(dir, STEEDOS_PROJECT_JSON, STEEDOS_PROJECT_JS);
|
|
91
93
|
if (!appPath) {
|
|
92
|
-
throw new Error(
|
|
94
|
+
throw new Error("InvalidAppWorkspace");
|
|
93
95
|
}
|
|
94
96
|
var appName = path.parse(appPath).name;
|
|
95
97
|
return appName;
|
|
@@ -140,7 +142,7 @@ function scanPackages(projectPath) {
|
|
|
140
142
|
if (!memberStat.isDirectory()) {
|
|
141
143
|
continue;
|
|
142
144
|
}
|
|
143
|
-
var minifestPath = path.join(member,
|
|
145
|
+
var minifestPath = path.join(member, "package.yml");
|
|
144
146
|
if (!fs.existsSync(minifestPath)) {
|
|
145
147
|
continue;
|
|
146
148
|
}
|
|
@@ -162,7 +164,7 @@ async function uncompressPackages(projectPath) {
|
|
|
162
164
|
let appPaths = glob.sync(path.join(packageFolder, "*.package"));
|
|
163
165
|
for (var i = 0; i < appPaths.length; i++) {
|
|
164
166
|
const appPath = appPaths[i];
|
|
165
|
-
var appName = path.basename(appPath,
|
|
167
|
+
var appName = path.basename(appPath, ".package");
|
|
166
168
|
var appFolder = path.join(packageFolder, appName);
|
|
167
169
|
var folderExists = true;
|
|
168
170
|
if (!fs.existsSync(appFolder)) {
|
|
@@ -173,10 +175,10 @@ async function uncompressPackages(projectPath) {
|
|
|
173
175
|
continue;
|
|
174
176
|
}
|
|
175
177
|
await compressing.zip.uncompress(appPath, appFolder);
|
|
176
|
-
var manifestPath = path.join(appFolder,
|
|
178
|
+
var manifestPath = path.join(appFolder, "package.yml");
|
|
177
179
|
if (!fs.existsSync(manifestPath)) {
|
|
178
180
|
(0, folderUtil_1.deleteFolderRecursive)(appFolder);
|
|
179
|
-
console.error(
|
|
181
|
+
console.error("manifest yml not found in app:" + appName);
|
|
180
182
|
}
|
|
181
183
|
}
|
|
182
184
|
}
|
package/lib/project/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/project/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/project/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/metadata-core",
|
|
3
|
-
"version": "3.0.0
|
|
3
|
+
"version": "3.0.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"files": [
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"build": "rimraf lib && tsc"
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@steedos/client": "3.0.0
|
|
15
|
+
"@steedos/client": "3.0.0",
|
|
16
16
|
"archiver": "^5.1.0",
|
|
17
17
|
"chalk": "^4.1.0",
|
|
18
18
|
"clone": "^2.1.2",
|
|
@@ -35,9 +35,8 @@
|
|
|
35
35
|
},
|
|
36
36
|
"author": "",
|
|
37
37
|
"license": "MIT",
|
|
38
|
-
"private": false,
|
|
39
38
|
"publishConfig": {
|
|
40
39
|
"access": "public"
|
|
41
40
|
},
|
|
42
|
-
"gitHead": "
|
|
41
|
+
"gitHead": "20ea485d800dd4ad0a99c82b26000879c2f85741"
|
|
43
42
|
}
|