@sap-ux/project-access 1.18.0 → 1.19.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/dist/project/cap.js +6 -8
- package/package.json +1 -1
package/dist/project/cap.js
CHANGED
|
@@ -129,16 +129,16 @@ function getCapModelAndServices(projectRoot) {
|
|
|
129
129
|
_projectRoot = projectRoot;
|
|
130
130
|
}
|
|
131
131
|
const cds = yield loadCdsModuleFromProject(_projectRoot);
|
|
132
|
-
_logger === null || _logger === void 0 ? void 0 : _logger.info(`@sap-ux/project-access:getCapModelAndServices - Using 'cds.home': ${cds.home}`);
|
|
133
|
-
_logger === null || _logger === void 0 ? void 0 : _logger.info(`@sap-ux/project-access:getCapModelAndServices - Using 'cds.version': ${cds.version}`);
|
|
134
|
-
_logger === null || _logger === void 0 ? void 0 : _logger.info(`@sap-ux/project-access:getCapModelAndServices - Using 'cds.root': ${cds.root}`);
|
|
135
132
|
const capProjectPaths = yield getCapCustomPaths(_projectRoot);
|
|
136
133
|
const modelPaths = [
|
|
137
134
|
(0, path_1.join)(_projectRoot, capProjectPaths.app),
|
|
138
135
|
(0, path_1.join)(_projectRoot, capProjectPaths.srv),
|
|
139
136
|
(0, path_1.join)(_projectRoot, capProjectPaths.db)
|
|
140
137
|
];
|
|
141
|
-
const model = yield cds.load(modelPaths);
|
|
138
|
+
const model = yield cds.load(modelPaths, { root: _projectRoot });
|
|
139
|
+
_logger === null || _logger === void 0 ? void 0 : _logger.info(`@sap-ux/project-access:getCapModelAndServices - Using 'cds.home': ${cds.home}`);
|
|
140
|
+
_logger === null || _logger === void 0 ? void 0 : _logger.info(`@sap-ux/project-access:getCapModelAndServices - Using 'cds.version': ${cds.version}`);
|
|
141
|
+
_logger === null || _logger === void 0 ? void 0 : _logger.info(`@sap-ux/project-access:getCapModelAndServices - Using 'cds.root': ${cds.root}`);
|
|
142
142
|
let services = (_a = cds.compile.to.serviceinfo(model, { root: _projectRoot })) !== null && _a !== void 0 ? _a : [];
|
|
143
143
|
if (services.map) {
|
|
144
144
|
services = services.map((value) => {
|
|
@@ -173,7 +173,7 @@ function getCdsFiles(projectRoot, ignoreErrors = false, envRoot) {
|
|
|
173
173
|
envRoot !== null && envRoot !== void 0 ? envRoot : (envRoot = yield getCdsRoots(projectRoot));
|
|
174
174
|
try {
|
|
175
175
|
const cds = yield loadCdsModuleFromProject(projectRoot);
|
|
176
|
-
csn = yield cds.load(envRoot);
|
|
176
|
+
csn = yield cds.load(envRoot, { root: projectRoot });
|
|
177
177
|
cdsFiles = [...((_a = csn['$sources']) !== null && _a !== void 0 ? _a : [])];
|
|
178
178
|
}
|
|
179
179
|
catch (e) {
|
|
@@ -236,7 +236,7 @@ function getCdsServices(projectRoot, ignoreErrors = true) {
|
|
|
236
236
|
const roots = yield getCdsRoots(projectRoot);
|
|
237
237
|
let model;
|
|
238
238
|
try {
|
|
239
|
-
model = yield cds.load(roots);
|
|
239
|
+
model = yield cds.load(roots, { root: projectRoot });
|
|
240
240
|
}
|
|
241
241
|
catch (e) {
|
|
242
242
|
if (ignoreErrors && e.model) {
|
|
@@ -383,8 +383,6 @@ function loadCdsModuleFromProject(capProjectPath) {
|
|
|
383
383
|
if (global) {
|
|
384
384
|
global.cds = cds;
|
|
385
385
|
}
|
|
386
|
-
// Ensure we use a known root path, otherwise `cwd` is used which varies between invocations.
|
|
387
|
-
cds.root = capProjectPath;
|
|
388
386
|
return cds;
|
|
389
387
|
});
|
|
390
388
|
}
|