@cubejs-backend/server 1.7.33 → 1.7.34
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/src/server/container.d.ts +0 -3
- package/dist/src/server/container.d.ts.map +1 -1
- package/dist/src/server/container.js +4 -33
- package/dist/src/server/container.js.map +1 -1
- package/dist/src/server/utils.d.ts +0 -1
- package/dist/src/server/utils.d.ts.map +1 -1
- package/dist/src/server/utils.js +1 -8
- package/dist/src/server/utils.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +8 -8
- package/dist/src/server/diagnostic-host.d.ts +0 -7
- package/dist/src/server/diagnostic-host.d.ts.map +0 -1
- package/dist/src/server/diagnostic-host.js +0 -41
- package/dist/src/server/diagnostic-host.js.map +0 -1
- package/dist/src/server/typescript-compiler.d.ts +0 -6
- package/dist/src/server/typescript-compiler.d.ts.map +0 -1
- package/dist/src/server/typescript-compiler.js +0 -49
- package/dist/src/server/typescript-compiler.js.map +0 -1
|
@@ -3,7 +3,6 @@ import { PackageManifest } from '@cubejs-backend/shared';
|
|
|
3
3
|
import { SystemOptions } from '@cubejs-backend/server-core';
|
|
4
4
|
import { ProjectLock } from './utils';
|
|
5
5
|
import { CreateOptions, CubejsServer } from '../server';
|
|
6
|
-
import type { TypescriptCompiler as TypescriptCompilerType } from './typescript-compiler';
|
|
7
6
|
export declare class ServerContainer {
|
|
8
7
|
protected readonly configuration: {
|
|
9
8
|
debug: boolean;
|
|
@@ -12,7 +11,6 @@ export declare class ServerContainer {
|
|
|
12
11
|
constructor(configuration: {
|
|
13
12
|
debug: boolean;
|
|
14
13
|
});
|
|
15
|
-
protected getTypeScriptCompiler(): TypescriptCompilerType;
|
|
16
14
|
protected compareBuiltInAndUserVersions(builtInVersion: SemVer, userVersion: SemVer): void;
|
|
17
15
|
protected parseLock(): Promise<ProjectLock | null>;
|
|
18
16
|
protected runProjectDockerDiagnostics(manifest: PackageManifest, lock: ProjectLock): Promise<void>;
|
|
@@ -20,7 +18,6 @@ export declare class ServerContainer {
|
|
|
20
18
|
runServerInstance(configuration: CreateOptions, embedded: boolean | undefined, isCubeConfigEmpty: boolean): Promise<CubejsServer>;
|
|
21
19
|
protected createServer(config: CreateOptions, systemOptions?: SystemOptions): CubejsServer;
|
|
22
20
|
lookupConfiguration(override?: boolean): Promise<CreateOptions>;
|
|
23
|
-
protected loadConfigurationFromMemory(content: string): Promise<CreateOptions>;
|
|
24
21
|
protected loadConfigurationFromPythonFile(): Promise<CreateOptions>;
|
|
25
22
|
protected loadConfigurationFromPythonMemory(content: string): Promise<CreateOptions>;
|
|
26
23
|
protected loadConfigurationFromFile(): Promise<CreateOptions>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../src/server/container.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../src/server/container.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwB,MAAM,EAA4B,MAAM,QAAQ,CAAC;AAChF,OAAO,EAIL,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAG5D,OAAO,EAKU,WAAW,EAC3B,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAUxD,qBAAa,eAAe;IAIxB,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE;IAHtD,SAAS,CAAC,iBAAiB,EAAE,OAAO,CAAQ;gBAGvB,aAAa,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE;IAItD,SAAS,CAAC,6BAA6B,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;cA0BnE,SAAS;cA+BT,2BAA2B,CAAC,QAAQ,EAAE,eAAe,EAAE,IAAI,EAAE,WAAW;IAgD3E,qBAAqB;IAgErB,iBAAiB,CAC5B,aAAa,EAAE,aAAa,EAC5B,QAAQ,qBAAiB,EACzB,iBAAiB,EAAE,OAAO;IAyB5B,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,aAAa,EAAE,aAAa,CAAC,EAAE,aAAa,GAAG,YAAY;IAI7E,mBAAmB,CAAC,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,aAAa,CAAC;cA+CnE,+BAA+B,IAAI,OAAO,CAAC,aAAa,CAAC;cAazD,iCAAiC,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;cAQ1E,yBAAyB,IAAI,OAAO,CAAC,aAAa,CAAC;IAkBnE;;OAEG;IACU,KAAK,CAAC,QAAQ,GAAE,OAAe;CAiG7C"}
|
|
@@ -30,7 +30,6 @@ exports.ServerContainer = void 0;
|
|
|
30
30
|
const path_1 = __importDefault(require("path"));
|
|
31
31
|
const fs_1 = __importDefault(require("fs"));
|
|
32
32
|
const promises_1 = __importDefault(require("fs/promises"));
|
|
33
|
-
const vm_1 = __importDefault(require("vm"));
|
|
34
33
|
const color_1 = __importDefault(require("@oclif/color"));
|
|
35
34
|
const dotenv_1 = __importDefault(require("@cubejs-backend/dotenv"));
|
|
36
35
|
const semver_1 = require("semver");
|
|
@@ -50,14 +49,6 @@ class ServerContainer {
|
|
|
50
49
|
constructor(configuration) {
|
|
51
50
|
this.configuration = configuration;
|
|
52
51
|
}
|
|
53
|
-
getTypeScriptCompiler() {
|
|
54
|
-
if ((0, shared_1.packageExists)('typescript', (0, shared_1.isDockerImage)())) {
|
|
55
|
-
// eslint-disable-next-line global-require
|
|
56
|
-
const { TypescriptCompiler } = require('./typescript-compiler');
|
|
57
|
-
return new TypescriptCompiler();
|
|
58
|
-
}
|
|
59
|
-
throw new Error('Typescript dependency not found. Please run this command from project directory.');
|
|
60
|
-
}
|
|
61
52
|
compareBuiltInAndUserVersions(builtInVersion, userVersion) {
|
|
62
53
|
const compareResult = (0, semver_1.compare)(builtInVersion, userVersion);
|
|
63
54
|
if (this.configuration.debug) {
|
|
@@ -145,7 +136,7 @@ class ServerContainer {
|
|
|
145
136
|
if (manifest.dependencies) {
|
|
146
137
|
// eslint-disable-next-line no-restricted-syntax
|
|
147
138
|
for (const [pkgName] of Object.entries(manifest.dependencies)) {
|
|
148
|
-
if ((0, utils_1.
|
|
139
|
+
if ((0, utils_1.isCubePackage)(pkgName) && !deepsToIgnore.includes(pkgName)) {
|
|
149
140
|
(0, shared_1.displayCLIWarning)(`"${pkgName}" package must be installed in devDependencies`);
|
|
150
141
|
}
|
|
151
142
|
}
|
|
@@ -218,35 +209,15 @@ class ServerContainer {
|
|
|
218
209
|
}
|
|
219
210
|
return this.loadConfigurationFromPythonFile();
|
|
220
211
|
}
|
|
221
|
-
if (fs_1.default.existsSync(path_1.default.join(process.cwd(), 'cube.ts'))) {
|
|
222
|
-
return this.loadConfigurationFromMemory(this.getTypeScriptCompiler().compileConfiguration());
|
|
223
|
-
}
|
|
224
212
|
if (fs_1.default.existsSync(path_1.default.join(process.cwd(), 'cube.js'))) {
|
|
225
213
|
return this.loadConfigurationFromFile();
|
|
226
214
|
}
|
|
215
|
+
if (fs_1.default.existsSync(path_1.default.join(process.cwd(), 'cube.ts'))) {
|
|
216
|
+
throw new Error('Configuration in cube.ts is no longer supported. Please use cube.js or cube.py instead.');
|
|
217
|
+
}
|
|
227
218
|
(0, shared_1.displayCLIWarning)('There is no cube.js file. Continue with environment variables');
|
|
228
219
|
return {};
|
|
229
220
|
}
|
|
230
|
-
async loadConfigurationFromMemory(content) {
|
|
231
|
-
if (this.configuration.debug) {
|
|
232
|
-
console.log('Loaded configuration from memory', content);
|
|
233
|
-
}
|
|
234
|
-
const exports = {};
|
|
235
|
-
const script = new vm_1.default.Script(content);
|
|
236
|
-
script.runInNewContext({
|
|
237
|
-
require,
|
|
238
|
-
console,
|
|
239
|
-
// Workaround for ES5 exports
|
|
240
|
-
exports
|
|
241
|
-
}, {
|
|
242
|
-
filename: 'cube.js',
|
|
243
|
-
displayErrors: true,
|
|
244
|
-
});
|
|
245
|
-
if (exports.default) {
|
|
246
|
-
return exports.default;
|
|
247
|
-
}
|
|
248
|
-
throw new Error('Configure file must export configuration as default.');
|
|
249
|
-
}
|
|
250
221
|
async loadConfigurationFromPythonFile() {
|
|
251
222
|
const content = await promises_1.default.readFile(path_1.default.join(process.cwd(), 'cube.py'), 'utf-8');
|
|
252
223
|
if (this.configuration.debug) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container.js","sourceRoot":"","sources":["../../../src/server/container.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,4CAAoB;AACpB,2DAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"container.js","sourceRoot":"","sources":["../../../src/server/container.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { SemVer } from 'semver';
|
|
2
2
|
export declare function isCubeNotServerPackage(pkgName: string): boolean;
|
|
3
3
|
export declare function isCubePackage(pkgName: string): boolean;
|
|
4
|
-
export declare function isDevPackage(pkgName: string): boolean;
|
|
5
4
|
export declare function isSimilarPackageRelease(pkg: SemVer, core: SemVer): boolean;
|
|
6
5
|
export declare function getMajorityVersion(pkg: SemVer, strict?: boolean): string;
|
|
7
6
|
export type ProjectLock = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/server/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/server/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAMhC,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEtD;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAM1E;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,OAAe,GAAG,MAAM,CAc/E;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAA;CAC/C,CAAC;AAEF,wBAAgB,YAAY,IAAI,WAAW,GAAG,IAAI,CA+BjD;AAED,wBAAgB,aAAa,IAAI,WAAW,GAAG,IAAI,CAqBlD"}
|
package/dist/src/server/utils.js
CHANGED
|
@@ -23,14 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.parseYarnLock = exports.parseNpmLock = exports.getMajorityVersion = exports.isSimilarPackageRelease = exports.
|
|
26
|
+
exports.parseYarnLock = exports.parseNpmLock = exports.getMajorityVersion = exports.isSimilarPackageRelease = exports.isCubePackage = exports.isCubeNotServerPackage = void 0;
|
|
27
27
|
const lockfile = __importStar(require("@yarnpkg/lockfile"));
|
|
28
28
|
const fs = __importStar(require("fs"));
|
|
29
29
|
const path = __importStar(require("path"));
|
|
30
30
|
const shared_1 = require("@cubejs-backend/shared");
|
|
31
|
-
const devPackages = [
|
|
32
|
-
'typescript',
|
|
33
|
-
];
|
|
34
31
|
function isCubeNotServerPackage(pkgName) {
|
|
35
32
|
return pkgName !== '@cubejs-backend/server' && pkgName.toLowerCase().startsWith('@cubejs-backend/');
|
|
36
33
|
}
|
|
@@ -39,10 +36,6 @@ function isCubePackage(pkgName) {
|
|
|
39
36
|
return pkgName.toLowerCase().startsWith('@cubejs-backend/');
|
|
40
37
|
}
|
|
41
38
|
exports.isCubePackage = isCubePackage;
|
|
42
|
-
function isDevPackage(pkgName) {
|
|
43
|
-
return isCubePackage(pkgName) || devPackages.includes(pkgName.toLowerCase());
|
|
44
|
-
}
|
|
45
|
-
exports.isDevPackage = isDevPackage;
|
|
46
39
|
function isSimilarPackageRelease(pkg, core) {
|
|
47
40
|
if (pkg.major === 0 && core.major === 0) {
|
|
48
41
|
return pkg.minor === core.minor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/server/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4DAA8C;AAC9C,uCAAyB;AACzB,2CAA6B;AAC7B,mDAA4D;AAE5D,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/server/utils.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"1.7.
|
|
1
|
+
{"version":"1.7.34","commands":{"dev-server":{"id":"dev-server","description":"Run server in Development mode","pluginName":"@cubejs-backend/server","pluginType":"core","aliases":[],"flags":{"debug":{"name":"debug","type":"boolean","description":"Print useful debug information","allowNo":false}},"args":[]},"server":{"id":"server","description":"Run server in Production mode","pluginName":"@cubejs-backend/server","pluginType":"core","aliases":[],"flags":{"debug":{"name":"debug","type":"boolean","description":"Print useful debug information","allowNo":false}},"args":[]}}}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@cubejs-backend/server",
|
|
3
3
|
"description": "Cube.js all-in-one server",
|
|
4
4
|
"author": "Cube Dev, Inc.",
|
|
5
|
-
"version": "1.7.
|
|
5
|
+
"version": "1.7.34",
|
|
6
6
|
"types": "index.d.ts",
|
|
7
7
|
"repository": {
|
|
8
8
|
"type": "git",
|
|
@@ -40,11 +40,11 @@
|
|
|
40
40
|
"jest:shapshot": "jest --updateSnapshot test"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@cubejs-backend/cubestore-driver": "1.7.
|
|
43
|
+
"@cubejs-backend/cubestore-driver": "1.7.34",
|
|
44
44
|
"@cubejs-backend/dotenv": "^9.0.2",
|
|
45
|
-
"@cubejs-backend/native": "1.7.
|
|
46
|
-
"@cubejs-backend/server-core": "1.7.
|
|
47
|
-
"@cubejs-backend/shared": "1.7.
|
|
45
|
+
"@cubejs-backend/native": "1.7.34",
|
|
46
|
+
"@cubejs-backend/server-core": "1.7.34",
|
|
47
|
+
"@cubejs-backend/shared": "1.7.34",
|
|
48
48
|
"@oclif/color": "^1.0.0",
|
|
49
49
|
"@oclif/command": "^1.8.13",
|
|
50
50
|
"@oclif/config": "^1.18.2",
|
|
@@ -61,8 +61,8 @@
|
|
|
61
61
|
"ws": "^7.1.2"
|
|
62
62
|
},
|
|
63
63
|
"devDependencies": {
|
|
64
|
-
"@cubejs-backend/linter": "1.7.
|
|
65
|
-
"@cubejs-backend/query-orchestrator": "1.7.
|
|
64
|
+
"@cubejs-backend/linter": "1.7.34",
|
|
65
|
+
"@cubejs-backend/query-orchestrator": "1.7.34",
|
|
66
66
|
"@oclif/dev-cli": "^1.23.1",
|
|
67
67
|
"@types/body-parser": "^1.19.0",
|
|
68
68
|
"@types/cors": "^2.8.8",
|
|
@@ -86,5 +86,5 @@
|
|
|
86
86
|
"@oclif/plugin-help"
|
|
87
87
|
]
|
|
88
88
|
},
|
|
89
|
-
"gitHead": "
|
|
89
|
+
"gitHead": "9237c26f3c6181fa6abe964ee784d4a997e89523"
|
|
90
90
|
}
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
import * as ts from 'typescript';
|
|
2
|
-
export declare class DiagnosticHost implements ts.FormatDiagnosticsHost {
|
|
3
|
-
getNewLine(): string;
|
|
4
|
-
getCurrentDirectory(): string;
|
|
5
|
-
getCanonicalFileName(fileName: string): string;
|
|
6
|
-
}
|
|
7
|
-
//# sourceMappingURL=diagnostic-host.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostic-host.d.ts","sourceRoot":"","sources":["../../../src/server/diagnostic-host.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,qBAAa,cAAe,YAAW,EAAE,CAAC,qBAAqB;IACtD,UAAU,IAAI,MAAM;IAIpB,mBAAmB,IAAI,MAAM;IAI7B,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;CAGtD"}
|
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.DiagnosticHost = void 0;
|
|
27
|
-
// eslint-disable-next-line import/no-extraneous-dependencies
|
|
28
|
-
const ts = __importStar(require("typescript"));
|
|
29
|
-
class DiagnosticHost {
|
|
30
|
-
getNewLine() {
|
|
31
|
-
return ts.sys.newLine;
|
|
32
|
-
}
|
|
33
|
-
getCurrentDirectory() {
|
|
34
|
-
return ts.sys.getCurrentDirectory();
|
|
35
|
-
}
|
|
36
|
-
getCanonicalFileName(fileName) {
|
|
37
|
-
return ts.sys.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
exports.DiagnosticHost = DiagnosticHost;
|
|
41
|
-
//# sourceMappingURL=diagnostic-host.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostic-host.js","sourceRoot":"","sources":["../../../src/server/diagnostic-host.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA6D;AAC7D,+CAAiC;AAEjC,MAAa,cAAc;IAClB,UAAU;QACf,OAAO,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC;IACxB,CAAC;IAEM,mBAAmB;QACxB,OAAO,EAAE,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IACtC,CAAC;IAEM,oBAAoB,CAAC,QAAgB;QAC1C,OAAO,EAAE,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC9E,CAAC;CACF;AAZD,wCAYC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-compiler.d.ts","sourceRoot":"","sources":["../../../src/server/typescript-compiler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,YAAY,CAAC;AAI5B,qBAAa,kBAAkB;IAC7B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,eAAe,CAU5C;IAEK,oBAAoB,QAAO,MAAM,CA+BtC;CACH"}
|
|
@@ -1,49 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.TypescriptCompiler = void 0;
|
|
7
|
-
// eslint-disable-next-line import/no-extraneous-dependencies
|
|
8
|
-
const typescript_1 = __importDefault(require("typescript"));
|
|
9
|
-
const path_1 = __importDefault(require("path"));
|
|
10
|
-
const diagnostic_host_1 = require("./diagnostic-host");
|
|
11
|
-
class TypescriptCompiler {
|
|
12
|
-
options = {
|
|
13
|
-
target: typescript_1.default.ScriptTarget.ES2017,
|
|
14
|
-
module: typescript_1.default.ModuleKind.CommonJS,
|
|
15
|
-
jsx: typescript_1.default.JsxEmit.None,
|
|
16
|
-
lib: [
|
|
17
|
-
'lib.es2017.full.d.ts',
|
|
18
|
-
],
|
|
19
|
-
rootDir: '/cube',
|
|
20
|
-
esModuleInterop: true,
|
|
21
|
-
moduleResolution: typescript_1.default.ModuleResolutionKind.NodeJs,
|
|
22
|
-
};
|
|
23
|
-
compileConfiguration = () => {
|
|
24
|
-
const files = [
|
|
25
|
-
path_1.default.join(process.cwd(), 'cube.ts')
|
|
26
|
-
];
|
|
27
|
-
// In-memory emit to protect override of cube.js when we compile cube.ts
|
|
28
|
-
const createdFiles = {};
|
|
29
|
-
const host = typescript_1.default.createCompilerHost(this.options);
|
|
30
|
-
host.writeFile = (fileName, contents) => {
|
|
31
|
-
createdFiles[path_1.default.basename(fileName)] = contents;
|
|
32
|
-
};
|
|
33
|
-
const program = typescript_1.default.createProgram(files, this.options, host);
|
|
34
|
-
const diagnostics = typescript_1.default.getPreEmitDiagnostics(program);
|
|
35
|
-
if (diagnostics.length) {
|
|
36
|
-
const DiagnosticHostInstance = new diagnostic_host_1.DiagnosticHost();
|
|
37
|
-
typescript_1.default.sys.write(typescript_1.default.formatDiagnosticsWithColorAndContext(diagnostics, DiagnosticHostInstance));
|
|
38
|
-
typescript_1.default.sys.exit(typescript_1.default.ExitStatus.DiagnosticsPresent_OutputsSkipped);
|
|
39
|
-
}
|
|
40
|
-
const emitResult = program.emit();
|
|
41
|
-
if (emitResult.emitSkipped) {
|
|
42
|
-
console.log('Unable to compile configuration file.');
|
|
43
|
-
process.exit(1);
|
|
44
|
-
}
|
|
45
|
-
return createdFiles['cube.js'];
|
|
46
|
-
};
|
|
47
|
-
}
|
|
48
|
-
exports.TypescriptCompiler = TypescriptCompiler;
|
|
49
|
-
//# sourceMappingURL=typescript-compiler.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-compiler.js","sourceRoot":"","sources":["../../../src/server/typescript-compiler.ts"],"names":[],"mappings":";;;;;;AAAA,6DAA6D;AAC7D,4DAA4B;AAC5B,gDAAwB;AACxB,uDAAmD;AAEnD,MAAa,kBAAkB;IACV,OAAO,GAAuB;QAC/C,MAAM,EAAE,oBAAE,CAAC,YAAY,CAAC,MAAM;QAC9B,MAAM,EAAE,oBAAE,CAAC,UAAU,CAAC,QAAQ;QAC9B,GAAG,EAAE,oBAAE,CAAC,OAAO,CAAC,IAAI;QACpB,GAAG,EAAE;YACH,sBAAsB;SACvB;QACD,OAAO,EAAE,OAAO;QAChB,eAAe,EAAE,IAAI;QACrB,gBAAgB,EAAE,oBAAE,CAAC,oBAAoB,CAAC,MAAM;KACjD,CAAC;IAEK,oBAAoB,GAAG,GAAW,EAAE;QACzC,MAAM,KAAK,GAAG;YACZ,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC;SACpC,CAAC;QAEF,wEAAwE;QACxE,MAAM,YAAY,GAA2B,EAAE,CAAC;QAEhD,MAAM,IAAI,GAAG,oBAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,SAAS,GAAG,CAAC,QAAgB,EAAE,QAAgB,EAAE,EAAE;YACtD,YAAY,CAAC,cAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAAC;QACnD,CAAC,CAAC;QAEF,MAAM,OAAO,GAAG,oBAAE,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAE5D,MAAM,WAAW,GAAG,oBAAE,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,MAAM,sBAAsB,GAAG,IAAI,gCAAc,EAAE,CAAC;YAEpD,oBAAE,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAE,CAAC,oCAAoC,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC,CAAC;YAC3F,oBAAE,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAE,CAAC,UAAU,CAAC,iCAAiC,CAAC,CAAC;SAC9D;QAED,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;QAElC,IAAI,UAAU,CAAC,WAAW,EAAE;YAC1B,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;YACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;QAED,OAAO,YAAY,CAAC,SAAS,CAAC,CAAC;IACjC,CAAC,CAAC;CACH;AA7CD,gDA6CC"}
|