Skip to content

Commit f6b34e5

Browse files
authored
feat: build languages (#114)
* feat: remove unused languages * refactor: move all language contibutions to languages dir * chore: remove useless scripts * test: fix unit test script * build: output esm version only
1 parent 206b0fd commit f6b34e5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+116
-4486
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
/*.iml
33
/node_modules/
44
/out/
5+
/esm/
56
/release/
67
.history
78
/docs/
89
.DS_Store
10+
*.tgz

package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
"version": "0.12.0-beta.ng.2",
44
"description": "SQL languages for the Monaco Editor, based on monaco-languages.",
55
"scripts": {
6-
"compile": "mrmdir ./out && tsc -p ./tsconfig.amd.json && tsc -p ./tsconfig.esm.json",
6+
"build": "mrmdir ./esm && tsc -p ./tsconfig.esm.json",
7+
"build-amd": "mrmdir ./out && tsc -p ./tsconfig.amd.json",
78
"watch-esm": "tsc -p ./tsconfig.esm.json --watch",
8-
"test": "npm run compile && mocha ./test/all.js",
9-
"prepublishOnly": "npm run compile",
10-
"prettier": "prettier --write .",
9+
"test": "npm run build-amd && mocha ./test/all.js",
10+
"prepublishOnly": "npm run build",
11+
"prettier": "prettier --write ./src",
1112
"check-types": "tsc -p ./tsconfig.json",
1213
"dev": "node --max_old_space_size=4092 & cd website && npm run dev",
1314
"prod": "mrmdir ./docs && node --max_old_space_size=4092 & cd website && npm run build",
@@ -16,11 +17,11 @@
1617
},
1718
"author": "DTStack Corporation",
1819
"license": "MIT",
19-
"main": "out/esm/main.js",
20-
"module": "out/esm/main.js",
21-
"types": "out/esm/main.d.ts",
20+
"main": "esm/main.js",
21+
"module": "esm/main.js",
22+
"types": "esm/main.d.ts",
2223
"files": [
23-
"out"
24+
"esm"
2425
],
2526
"repository": {
2627
"type": "git",

scripts/bundle.js

Lines changed: 0 additions & 72 deletions
This file was deleted.

scripts/release.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/all.contributions.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import './flinksql/flinksql.contribution';
2-
import './sparksql/sparksql.contribution';
3-
import './hivesql/hivesql.contribution';
4-
import './trinosql/trinosql.contribution';
5-
import './sql/sql.contribution';
6-
import './mysql/mysql.contribution';
7-
import './plsql/plsql.contribution';
8-
import './pgsql/pgsql.contribution';
9-
import './impalasql/impalasql.contribution';
1+
import './languages/flink/flink.contribution';
2+
import './languages/spark/spark.contribution';
3+
import './languages/hive/hive.contribution';
4+
import './languages/trino/trino.contribution';
5+
import './languages/mysql/mysql.contribution';
6+
import './languages/pgsql/pgsql.contribution';
7+
import './languages/impala/impala.contribution';

src/flinksql/flinksql.contribution.ts renamed to src/languages/flink/flink.contribution.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { registerLanguage } from '../_.contribution';
7-
import { setupLanguageFeatures } from '../setupLanguageFeatures';
8-
import { LanguageIdEnum } from '../common/constants';
6+
import { registerLanguage } from '../../_.contribution';
7+
import { setupLanguageFeatures } from '../../setupLanguageFeatures';
8+
import { LanguageIdEnum } from '../../common/constants';
99

1010
registerLanguage({
1111
id: LanguageIdEnum.FLINK,
1212
extensions: ['.flinksql'],
1313
aliases: ['FlinkSQL', 'flink', 'Flink'],
14-
loader: () => import('./flinksql')
14+
loader: () => import('./flink')
1515
});
1616

1717
setupLanguageFeatures(LanguageIdEnum.FLINK, {
File renamed without changes.

src/flinksql/flinksql.ts renamed to src/languages/flink/flink.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import type { languages } from '../fillers/monaco-editor-core';
7-
import { TokenClassConsts } from '../common/constants';
6+
import type { languages } from '../../fillers/monaco-editor-core';
7+
import { TokenClassConsts } from '../../common/constants';
88

99
export const conf: languages.LanguageConfiguration = {
1010
comments: {

src/flinksql/flinksql.worker.ts renamed to src/languages/flink/flink.worker.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { worker } from '../fillers/monaco-editor-core';
1+
import { worker } from '../../fillers/monaco-editor-core';
22
import * as EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker.js';
3-
import { FLinkSQLWorker } from './flinkSQLWorker';
4-
import { ICreateData } from '../baseSQLWorker';
3+
import { FLinkSQLWorker } from './flinkWorker';
4+
import { ICreateData } from '../../baseSQLWorker';
55

66
self.onmessage = () => {
77
// ignore the first message

src/flinksql/flinkSQLWorker.ts renamed to src/languages/flink/flinkWorker.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { worker } from '../fillers/monaco-editor-core';
1+
import { worker } from '../../fillers/monaco-editor-core';
22
import { FlinkSQL } from 'dt-sql-parser/dist/parser/flink';
3-
import { BaseSQLWorker, ICreateData } from '../baseSQLWorker';
3+
import { BaseSQLWorker, ICreateData } from '../../baseSQLWorker';
44

55
export class FLinkSQLWorker extends BaseSQLWorker {
66
protected _ctx: worker.IWorkerContext;

0 commit comments

Comments
 (0)