@nrwl/js 15.7.0-beta.0 → 15.7.0-beta.3
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/CHANGELOG.md +1 -1
- package/package.json +5 -5
- package/src/executors/swc/schema.json +4 -2
- package/src/executors/tsc/schema.json +2 -1
- package/src/generators/library/schema.json +16 -8
- package/src/utils/code-frames/identifiers.d.ts +0 -20
- package/src/utils/code-frames/identifiers.js +38 -184
- package/src/utils/code-frames/identifiers.js.map +1 -1
- package/src/utils/typescript/run-type-check.js +5 -3
- package/src/utils/typescript/run-type-check.js.map +1 -1
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +1 -1
- package/src/utils/code-frames/code-frames.d.ts +0 -14
- package/src/utils/code-frames/code-frames.js +0 -125
- package/src/utils/code-frames/code-frames.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/js
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/js",
|
|
3
|
-
"version": "15.7.0-beta.
|
|
3
|
+
"version": "15.7.0-beta.3",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
|
|
6
6
|
"repository": {
|
|
@@ -39,9 +39,9 @@
|
|
|
39
39
|
"@babel/preset-env": "^7.15.0",
|
|
40
40
|
"@babel/preset-typescript": "^7.15.0",
|
|
41
41
|
"@babel/runtime": "^7.14.8",
|
|
42
|
-
"@nrwl/devkit": "15.7.0-beta.
|
|
43
|
-
"@nrwl/linter": "15.7.0-beta.
|
|
44
|
-
"@nrwl/workspace": "15.7.0-beta.
|
|
42
|
+
"@nrwl/devkit": "15.7.0-beta.3",
|
|
43
|
+
"@nrwl/linter": "15.7.0-beta.3",
|
|
44
|
+
"@nrwl/workspace": "15.7.0-beta.3",
|
|
45
45
|
"babel-plugin-const-enum": "^1.0.1",
|
|
46
46
|
"babel-plugin-macros": "^2.8.0",
|
|
47
47
|
"babel-plugin-transform-typescript-metadata": "^0.3.1",
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"access": "public"
|
|
60
60
|
},
|
|
61
61
|
"types": "./src/index.d.ts",
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "b2bd4f27e04124c70a19c53191a4503bacf0b229"
|
|
63
63
|
}
|
|
@@ -51,7 +51,8 @@
|
|
|
51
51
|
"skipTypeCheck": {
|
|
52
52
|
"type": "boolean",
|
|
53
53
|
"description": "Whether to skip TypeScript type checking.",
|
|
54
|
-
"default": false
|
|
54
|
+
"default": false,
|
|
55
|
+
"x-priority": "important"
|
|
55
56
|
},
|
|
56
57
|
"swcExclude": {
|
|
57
58
|
"type": "array",
|
|
@@ -62,7 +63,8 @@
|
|
|
62
63
|
"./src/**/jest-setup.ts$",
|
|
63
64
|
"./**/jest-setup.ts$",
|
|
64
65
|
"./**/.*.js$"
|
|
65
|
-
]
|
|
66
|
+
],
|
|
67
|
+
"hidden": true
|
|
66
68
|
},
|
|
67
69
|
"updateBuildableProjectDepsInPackageJson": {
|
|
68
70
|
"type": "boolean",
|
|
@@ -18,7 +18,8 @@
|
|
|
18
18
|
},
|
|
19
19
|
"directory": {
|
|
20
20
|
"type": "string",
|
|
21
|
-
"description": "A directory where the lib is placed."
|
|
21
|
+
"description": "A directory where the lib is placed.",
|
|
22
|
+
"x-priority": "important"
|
|
22
23
|
},
|
|
23
24
|
"linter": {
|
|
24
25
|
"description": "The tool to use for running lint checks.",
|
|
@@ -39,12 +40,14 @@
|
|
|
39
40
|
"skipFormat": {
|
|
40
41
|
"description": "Skip formatting files.",
|
|
41
42
|
"type": "boolean",
|
|
42
|
-
"default": false
|
|
43
|
+
"default": false,
|
|
44
|
+
"x-priority": "internal"
|
|
43
45
|
},
|
|
44
46
|
"skipTsConfig": {
|
|
45
47
|
"type": "boolean",
|
|
46
48
|
"description": "Do not update tsconfig.json for development experience.",
|
|
47
|
-
"default": false
|
|
49
|
+
"default": false,
|
|
50
|
+
"x-priority": "internal"
|
|
48
51
|
},
|
|
49
52
|
"includeBabelRc": {
|
|
50
53
|
"type": "boolean",
|
|
@@ -79,12 +82,14 @@
|
|
|
79
82
|
"publishable": {
|
|
80
83
|
"type": "boolean",
|
|
81
84
|
"default": false,
|
|
82
|
-
"description": "Generate a publishable library."
|
|
85
|
+
"description": "Generate a publishable library.",
|
|
86
|
+
"x-priority": "important"
|
|
83
87
|
},
|
|
84
88
|
"buildable": {
|
|
85
89
|
"type": "boolean",
|
|
86
90
|
"default": true,
|
|
87
|
-
"description": "Generate a buildable library."
|
|
91
|
+
"description": "Generate a buildable library.",
|
|
92
|
+
"x-priority": "important"
|
|
88
93
|
},
|
|
89
94
|
"setParserOptionsProject": {
|
|
90
95
|
"type": "boolean",
|
|
@@ -95,19 +100,22 @@
|
|
|
95
100
|
"type": "string",
|
|
96
101
|
"enum": ["workspace", "project", "npm-scripts"],
|
|
97
102
|
"default": "project",
|
|
98
|
-
"description": "Determines whether the project's executors should be configured in `workspace.json`, `project.json` or as npm scripts."
|
|
103
|
+
"description": "Determines whether the project's executors should be configured in `workspace.json`, `project.json` or as npm scripts.",
|
|
104
|
+
"x-priority": "internal"
|
|
99
105
|
},
|
|
100
106
|
"compiler": {
|
|
101
107
|
"type": "string",
|
|
102
108
|
"enum": ["tsc", "swc"],
|
|
103
109
|
"default": "tsc",
|
|
104
|
-
"description": "The compiler used by the build and test targets"
|
|
110
|
+
"description": "The compiler used by the build and test targets",
|
|
111
|
+
"x-priority": "important"
|
|
105
112
|
},
|
|
106
113
|
"bundler": {
|
|
107
114
|
"description": "The bundler to use.",
|
|
108
115
|
"type": "string",
|
|
109
116
|
"enum": ["none", "esbuild", "rollup", "vite", "webpack"],
|
|
110
|
-
"default": "none"
|
|
117
|
+
"default": "none",
|
|
118
|
+
"x-priority": "important"
|
|
111
119
|
},
|
|
112
120
|
"skipTypeCheck": {
|
|
113
121
|
"type": "boolean",
|
|
@@ -1,25 +1,5 @@
|
|
|
1
|
-
export declare function isIdentifierStart(code: number): boolean;
|
|
2
|
-
export declare function isIdentifierChar(code: number): boolean;
|
|
3
|
-
export declare function isIdentifierName(name: string): boolean;
|
|
4
1
|
/**
|
|
5
2
|
* Checks if word is a reserved word in non-strict mode
|
|
6
3
|
*/
|
|
7
4
|
export declare function isReservedWord(word: string, inModule?: boolean): boolean;
|
|
8
|
-
/**
|
|
9
|
-
* Checks if word is a reserved word in non-binding strict mode
|
|
10
|
-
*
|
|
11
|
-
* Includes non-strict reserved words
|
|
12
|
-
*/
|
|
13
|
-
export declare function isStrictReservedWord(word: string, inModule: boolean): boolean;
|
|
14
|
-
/**
|
|
15
|
-
* Checks if word is a reserved word in binding strict mode, but it is allowed as
|
|
16
|
-
* a normal identifier.
|
|
17
|
-
*/
|
|
18
|
-
export declare function isStrictBindOnlyReservedWord(word: string): boolean;
|
|
19
|
-
/**
|
|
20
|
-
* Checks if word is a reserved word in binding strict mode
|
|
21
|
-
*
|
|
22
|
-
* Includes non-strict reserved words and non-binding strict reserved words
|
|
23
|
-
*/
|
|
24
|
-
export declare function isStrictBindReservedWord(word: string, inModule: boolean): boolean;
|
|
25
5
|
export declare function isKeyword(word: string): boolean;
|
|
@@ -1,164 +1,44 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
// Adapted from https://raw.githubusercontent.com/babel/babel/6a00cbe/packages/babel-helper-validator-identifier/src/identifier.js
|
|
3
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.isKeyword = exports.
|
|
5
|
-
// ## Character codes
|
|
6
|
-
const uppercaseA = 65;
|
|
7
|
-
const lowercaseA = 97;
|
|
8
|
-
const dollarSign = 36;
|
|
9
|
-
const lowercaseZ = 122;
|
|
10
|
-
const uppercaseZ = 90;
|
|
11
|
-
const underscore = 95;
|
|
12
|
-
const digit0 = 48;
|
|
13
|
-
const colon = 58;
|
|
14
|
-
// ## Character categories
|
|
15
|
-
// Big ugly regular expressions that match characters in the
|
|
16
|
-
// whitespace, identifier, and identifier-start categories. These
|
|
17
|
-
// are only applied when a character is found to actually have a
|
|
18
|
-
// code point between 0x80 and 0xffff.
|
|
19
|
-
// Generated by `scripts/generate-identifier-regex.js`.
|
|
20
|
-
/* prettier-ignore */
|
|
21
|
-
let nonASCIIidentifierStartChars = '\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0560-\u0588\u05d0-\u05ea\u05ef-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0860-\u086a\u08a0-\u08b4\u08b6-\u08c7\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u09fc\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d04-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e86-\u0e8a\u0e8c-\u0ea3\u0ea5\u0ea7-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1878\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c88\u1c90-\u1cba\u1cbd-\u1cbf\u1ce9-\u1cec\u1cee-\u1cf3\u1cf5\u1cf6\u1cfa\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312f\u3131-\u318e\u31a0-\u31bf\u31f0-\u31ff\u3400-\u4dbf\u4e00-\u9ffc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7bf\ua7c2-\ua7ca\ua7f5-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua8fe\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab69\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc';
|
|
22
|
-
/* prettier-ignore */
|
|
23
|
-
let nonASCIIidentifierChars = '\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u07fd\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08d3-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u09fe\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0afa-\u0aff\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b55-\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c04\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d00-\u0d03\u0d3b\u0d3c\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d81-\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1abf\u1ac0\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf4\u1cf7-\u1cf9\u1dc0-\u1df9\u1dfb-\u1dff\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua82c\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua8ff-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f';
|
|
24
|
-
const nonASCIIidentifierStart = new RegExp('[' + nonASCIIidentifierStartChars + ']');
|
|
25
|
-
const nonASCIIidentifier = new RegExp('[' + nonASCIIidentifierStartChars + nonASCIIidentifierChars + ']');
|
|
26
|
-
nonASCIIidentifierStartChars = nonASCIIidentifierChars = null;
|
|
27
|
-
// These are a run-length and offset-encoded representation of the
|
|
28
|
-
// >0xffff code points that are a valid part of identifiers. The
|
|
29
|
-
// offset starts at 0x10000, and each pair of numbers represents an
|
|
30
|
-
// offset to the next range, and then a size of the range. They were
|
|
31
|
-
// generated by `scripts/generate-identifier-regex.js`.
|
|
32
|
-
/* prettier-ignore */
|
|
33
|
-
/* prettier-ignore */
|
|
34
|
-
const astralIdentifierStartCodes = [0, 11, 2, 25, 2, 18, 2, 1, 2, 14, 3, 13, 35, 122, 70, 52, 268, 28, 4, 48, 48, 31, 14, 29, 6, 37, 11, 29, 3, 35, 5, 7, 2, 4, 43, 157, 19, 35, 5, 35, 5, 39, 9, 51, 157, 310, 10, 21, 11, 7, 153, 5, 3, 0, 2, 43, 2, 1, 4, 0, 3, 22, 11, 22, 10, 30, 66, 18, 2, 1, 11, 21, 11, 25, 71, 55, 7, 1, 65, 0, 16, 3, 2, 2, 2, 28, 43, 28, 4, 28, 36, 7, 2, 27, 28, 53, 11, 21, 11, 18, 14, 17, 111, 72, 56, 50, 14, 50, 14, 35, 349, 41, 7, 1, 79, 28, 11, 0, 9, 21, 107, 20, 28, 22, 13, 52, 76, 44, 33, 24, 27, 35, 30, 0, 3, 0, 9, 34, 4, 0, 13, 47, 15, 3, 22, 0, 2, 0, 36, 17, 2, 24, 85, 6, 2, 0, 2, 3, 2, 14, 2, 9, 8, 46, 39, 7, 3, 1, 3, 21, 2, 6, 2, 1, 2, 4, 4, 0, 19, 0, 13, 4, 159, 52, 19, 3, 21, 2, 31, 47, 21, 1, 2, 0, 185, 46, 42, 3, 37, 47, 21, 0, 60, 42, 14, 0, 72, 26, 230, 43, 117, 63, 32, 7, 3, 0, 3, 7, 2, 1, 2, 23, 16, 0, 2, 0, 95, 7, 3, 38, 17, 0, 2, 0, 29, 0, 11, 39, 8, 0, 22, 0, 12, 45, 20, 0, 35, 56, 264, 8, 2, 36, 18, 0, 50, 29, 113, 6, 2, 1, 2, 37, 22, 0, 26, 5, 2, 1, 2, 31, 15, 0, 328, 18, 190, 0, 80, 921, 103, 110, 18, 195, 2749, 1070, 4050, 582, 8634, 568, 8, 30, 114, 29, 19, 47, 17, 3, 32, 20, 6, 18, 689, 63, 129, 74, 6, 0, 67, 12, 65, 1, 2, 0, 29, 6135, 9, 1237, 43, 8, 8952, 286, 50, 2, 18, 3, 9, 395, 2309, 106, 6, 12, 4, 8, 8, 9, 5991, 84, 2, 70, 2, 1, 3, 0, 3, 1, 3, 3, 2, 11, 2, 0, 2, 6, 2, 64, 2, 3, 3, 7, 2, 6, 2, 27, 2, 3, 2, 4, 2, 0, 4, 6, 2, 339, 3, 24, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 7, 2357, 44, 11, 6, 17, 0, 370, 43, 1301, 196, 60, 67, 8, 0, 1205, 3, 2, 26, 2, 1, 2, 0, 3, 0, 2, 9, 2, 3, 2, 0, 2, 0, 7, 0, 5, 0, 2, 0, 2, 0, 2, 2, 2, 1, 2, 0, 3, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 1, 2, 0, 3, 3, 2, 6, 2, 3, 2, 3, 2, 0, 2, 9, 2, 16, 6, 2, 2, 4, 2, 16, 4421, 42717, 35, 4148, 12, 221, 3, 5761, 15, 7472, 3104, 541, 1507, 4938];
|
|
35
|
-
/* prettier-ignore */
|
|
36
|
-
const astralIdentifierCodes = [509, 0, 227, 0, 150, 4, 294, 9, 1368, 2, 2, 1, 6, 3, 41, 2, 5, 0, 166, 1, 574, 3, 9, 9, 370, 1, 154, 10, 176, 2, 54, 14, 32, 9, 16, 3, 46, 10, 54, 9, 7, 2, 37, 13, 2, 9, 6, 1, 45, 0, 13, 2, 49, 13, 9, 3, 2, 11, 83, 11, 7, 0, 161, 11, 6, 9, 7, 3, 56, 1, 2, 6, 3, 1, 3, 2, 10, 0, 11, 1, 3, 6, 4, 4, 193, 17, 10, 9, 5, 0, 82, 19, 13, 9, 214, 6, 3, 8, 28, 1, 83, 16, 16, 9, 82, 12, 9, 9, 84, 14, 5, 9, 243, 14, 166, 9, 71, 5, 2, 1, 3, 3, 2, 0, 2, 1, 13, 9, 120, 6, 3, 6, 4, 0, 29, 9, 41, 6, 2, 3, 9, 0, 10, 10, 47, 15, 406, 7, 2, 7, 17, 9, 57, 21, 2, 13, 123, 5, 4, 0, 2, 1, 2, 6, 2, 0, 9, 9, 49, 4, 2, 1, 2, 4, 9, 9, 330, 3, 19306, 9, 135, 4, 60, 6, 26, 9, 1014, 0, 2, 54, 8, 3, 82, 0, 12, 1, 19628, 1, 5319, 4, 4, 5, 9, 7, 3, 6, 31, 3, 149, 2, 1418, 49, 513, 54, 5, 49, 9, 0, 15, 0, 23, 4, 2, 14, 1361, 6, 2, 16, 3, 6, 2, 1, 2, 4, 262, 6, 10, 9, 419, 13, 1495, 6, 110, 6, 6, 9, 4759, 9, 787719, 239];
|
|
37
|
-
// This has a complexity linear to the value of the code. The
|
|
38
|
-
// assumption is that looking up astral identifier characters is
|
|
39
|
-
// rare.
|
|
40
|
-
function isInAstralSet(code, set) {
|
|
41
|
-
let pos = 0x10000;
|
|
42
|
-
for (let i = 0, length = set.length; i < length; i += 2) {
|
|
43
|
-
pos += set[i];
|
|
44
|
-
if (pos > code)
|
|
45
|
-
return false;
|
|
46
|
-
pos += set[i + 1];
|
|
47
|
-
if (pos >= code)
|
|
48
|
-
return true;
|
|
49
|
-
}
|
|
50
|
-
return false;
|
|
51
|
-
}
|
|
52
|
-
// Test whether a given character code starts an identifier.
|
|
53
|
-
function isIdentifierStart(code) {
|
|
54
|
-
if (code < uppercaseA)
|
|
55
|
-
return code === dollarSign;
|
|
56
|
-
if (code <= uppercaseZ)
|
|
57
|
-
return true;
|
|
58
|
-
if (code < lowercaseA)
|
|
59
|
-
return code === underscore;
|
|
60
|
-
if (code <= lowercaseZ)
|
|
61
|
-
return true;
|
|
62
|
-
if (code <= 0xffff) {
|
|
63
|
-
return (code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code)));
|
|
64
|
-
}
|
|
65
|
-
return isInAstralSet(code, astralIdentifierStartCodes);
|
|
66
|
-
}
|
|
67
|
-
exports.isIdentifierStart = isIdentifierStart;
|
|
68
|
-
// Test whether a given character is part of an identifier.
|
|
69
|
-
function isIdentifierChar(code) {
|
|
70
|
-
if (code < digit0)
|
|
71
|
-
return code === dollarSign;
|
|
72
|
-
if (code < colon)
|
|
73
|
-
return true;
|
|
74
|
-
if (code < uppercaseA)
|
|
75
|
-
return false;
|
|
76
|
-
if (code <= uppercaseZ)
|
|
77
|
-
return true;
|
|
78
|
-
if (code < lowercaseA)
|
|
79
|
-
return code === underscore;
|
|
80
|
-
if (code <= lowercaseZ)
|
|
81
|
-
return true;
|
|
82
|
-
if (code <= 0xffff) {
|
|
83
|
-
return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code));
|
|
84
|
-
}
|
|
85
|
-
return (isInAstralSet(code, astralIdentifierStartCodes) ||
|
|
86
|
-
isInAstralSet(code, astralIdentifierCodes));
|
|
87
|
-
}
|
|
88
|
-
exports.isIdentifierChar = isIdentifierChar;
|
|
89
|
-
// Test whether a given string is a valid identifier name
|
|
90
|
-
function isIdentifierName(name) {
|
|
91
|
-
let isFirst = true;
|
|
92
|
-
for (const char of Array.from(name)) {
|
|
93
|
-
const cp = char.codePointAt(0);
|
|
94
|
-
if (isFirst) {
|
|
95
|
-
if (!isIdentifierStart(cp)) {
|
|
96
|
-
return false;
|
|
97
|
-
}
|
|
98
|
-
isFirst = false;
|
|
99
|
-
}
|
|
100
|
-
else if (!isIdentifierChar(cp)) {
|
|
101
|
-
return false;
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
return !isFirst;
|
|
105
|
-
}
|
|
106
|
-
exports.isIdentifierName = isIdentifierName;
|
|
3
|
+
exports.isKeyword = exports.isReservedWord = void 0;
|
|
107
4
|
// Adapted from https://raw.githubusercontent.com/babel/babel/e39b508030a9f696584d21b0eb9677498e3ca231/packages/babel-helper-validator-identifier/src/keyword.js
|
|
108
|
-
const
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
],
|
|
146
|
-
strict: [
|
|
147
|
-
'implements',
|
|
148
|
-
'interface',
|
|
149
|
-
'let',
|
|
150
|
-
'package',
|
|
151
|
-
'private',
|
|
152
|
-
'protected',
|
|
153
|
-
'public',
|
|
154
|
-
'static',
|
|
155
|
-
'yield',
|
|
156
|
-
],
|
|
157
|
-
strictBind: ['eval', 'arguments'],
|
|
158
|
-
};
|
|
159
|
-
const keywords = new Set(reservedWords.keyword);
|
|
160
|
-
const reservedWordsStrictSet = new Set(reservedWords.strict);
|
|
161
|
-
const reservedWordsStrictBindSet = new Set(reservedWords.strictBind);
|
|
5
|
+
const keywords = new Set([
|
|
6
|
+
'break',
|
|
7
|
+
'case',
|
|
8
|
+
'catch',
|
|
9
|
+
'continue',
|
|
10
|
+
'debugger',
|
|
11
|
+
'default',
|
|
12
|
+
'do',
|
|
13
|
+
'else',
|
|
14
|
+
'finally',
|
|
15
|
+
'for',
|
|
16
|
+
'function',
|
|
17
|
+
'if',
|
|
18
|
+
'return',
|
|
19
|
+
'switch',
|
|
20
|
+
'throw',
|
|
21
|
+
'try',
|
|
22
|
+
'var',
|
|
23
|
+
'const',
|
|
24
|
+
'while',
|
|
25
|
+
'with',
|
|
26
|
+
'new',
|
|
27
|
+
'this',
|
|
28
|
+
'super',
|
|
29
|
+
'class',
|
|
30
|
+
'extends',
|
|
31
|
+
'export',
|
|
32
|
+
'import',
|
|
33
|
+
'null',
|
|
34
|
+
'true',
|
|
35
|
+
'false',
|
|
36
|
+
'in',
|
|
37
|
+
'instanceof',
|
|
38
|
+
'typeof',
|
|
39
|
+
'void',
|
|
40
|
+
'delete',
|
|
41
|
+
]);
|
|
162
42
|
/**
|
|
163
43
|
* Checks if word is a reserved word in non-strict mode
|
|
164
44
|
*/
|
|
@@ -166,32 +46,6 @@ function isReservedWord(word, inModule) {
|
|
|
166
46
|
return (inModule && word === 'await') || word === 'enum';
|
|
167
47
|
}
|
|
168
48
|
exports.isReservedWord = isReservedWord;
|
|
169
|
-
/**
|
|
170
|
-
* Checks if word is a reserved word in non-binding strict mode
|
|
171
|
-
*
|
|
172
|
-
* Includes non-strict reserved words
|
|
173
|
-
*/
|
|
174
|
-
function isStrictReservedWord(word, inModule) {
|
|
175
|
-
return isReservedWord(word, inModule) || reservedWordsStrictSet.has(word);
|
|
176
|
-
}
|
|
177
|
-
exports.isStrictReservedWord = isStrictReservedWord;
|
|
178
|
-
/**
|
|
179
|
-
* Checks if word is a reserved word in binding strict mode, but it is allowed as
|
|
180
|
-
* a normal identifier.
|
|
181
|
-
*/
|
|
182
|
-
function isStrictBindOnlyReservedWord(word) {
|
|
183
|
-
return reservedWordsStrictBindSet.has(word);
|
|
184
|
-
}
|
|
185
|
-
exports.isStrictBindOnlyReservedWord = isStrictBindOnlyReservedWord;
|
|
186
|
-
/**
|
|
187
|
-
* Checks if word is a reserved word in binding strict mode
|
|
188
|
-
*
|
|
189
|
-
* Includes non-strict reserved words and non-binding strict reserved words
|
|
190
|
-
*/
|
|
191
|
-
function isStrictBindReservedWord(word, inModule) {
|
|
192
|
-
return (isStrictReservedWord(word, inModule) || isStrictBindOnlyReservedWord(word));
|
|
193
|
-
}
|
|
194
|
-
exports.isStrictBindReservedWord = isStrictBindReservedWord;
|
|
195
49
|
function isKeyword(word) {
|
|
196
50
|
return keywords.has(word);
|
|
197
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identifiers.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/code-frames/identifiers.ts"],"names":[],"mappings":";AAAA,kIAAkI;;;AAElI,qBAAqB;AACrB,MAAM,UAAU,GAAG,EAAE,CAAC;AACtB,MAAM,UAAU,GAAG,EAAE,CAAC;AACtB,MAAM,UAAU,GAAG,EAAE,CAAC;AACtB,MAAM,UAAU,GAAG,GAAG,CAAC;AACvB,MAAM,UAAU,GAAG,EAAE,CAAC;AACtB,MAAM,UAAU,GAAG,EAAE,CAAC;AACtB,MAAM,MAAM,GAAG,EAAE,CAAC;AAClB,MAAM,KAAK,GAAG,EAAE,CAAC;AAEjB,0BAA0B;AAE1B,4DAA4D;AAC5D,iEAAiE;AACjE,gEAAgE;AAChE,sCAAsC;AACtC,uDAAuD;AAEvD,qBAAqB;AACrB,IAAI,4BAA4B,GAAG,urIAAurI,CAAC;AAC3tI,qBAAqB;AACrB,IAAI,uBAAuB,GAAG,sjFAAsjF,CAAC;AAErlF,MAAM,uBAAuB,GAAG,IAAI,MAAM,CACxC,GAAG,GAAG,4BAA4B,GAAG,GAAG,CACzC,CAAC;AACF,MAAM,kBAAkB,GAAG,IAAI,MAAM,CACnC,GAAG,GAAG,4BAA4B,GAAG,uBAAuB,GAAG,GAAG,CACnE,CAAC;AAEF,4BAA4B,GAAG,uBAAuB,GAAG,IAAI,CAAC;AAE9D,kEAAkE;AAClE,gEAAgE;AAChE,mEAAmE;AACnE,oEAAoE;AACpE,uDAAuD;AACvD,qBAAqB;AACrB,qBAAqB;AACrB,MAAM,0BAA0B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACvxD,qBAAqB;AACrB,MAAM,qBAAqB,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC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"}
|
|
1
|
+
{"version":3,"file":"identifiers.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/code-frames/identifiers.ts"],"names":[],"mappings":";;;AAAA,gKAAgK;AAChK,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC;IACvB,OAAO;IACP,MAAM;IACN,OAAO;IACP,UAAU;IACV,UAAU;IACV,SAAS;IACT,IAAI;IACJ,MAAM;IACN,SAAS;IACT,KAAK;IACL,UAAU;IACV,IAAI;IACJ,QAAQ;IACR,QAAQ;IACR,OAAO;IACP,KAAK;IACL,KAAK;IACL,OAAO;IACP,OAAO;IACP,MAAM;IACN,KAAK;IACL,MAAM;IACN,OAAO;IACP,OAAO;IACP,SAAS;IACT,QAAQ;IACR,QAAQ;IACR,MAAM;IACN,MAAM;IACN,OAAO;IACP,IAAI;IACJ,YAAY;IACZ,QAAQ;IACR,MAAM;IACN,QAAQ;CACT,CAAC,CAAC;AAEH;;GAEG;AACH,SAAgB,cAAc,CAAC,IAAY,EAAE,QAAkB;IAC7D,OAAO,CAAC,QAAQ,IAAI,IAAI,KAAK,OAAO,CAAC,IAAI,IAAI,KAAK,MAAM,CAAC;AAC3D,CAAC;AAFD,wCAEC;AAED,SAAgB,SAAS,CAAC,IAAY;IACpC,OAAO,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AAFD,8BAEC"}
|
|
@@ -5,7 +5,8 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
6
6
|
const chalk = require("chalk");
|
|
7
7
|
const path = require("path");
|
|
8
|
-
const code_frames_1 = require("
|
|
8
|
+
const code_frames_1 = require("nx/src/utils/code-frames");
|
|
9
|
+
const highlight_1 = require("../code-frames/highlight");
|
|
9
10
|
function runTypeCheckWatch(options, callback) {
|
|
10
11
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
12
|
const { ts, workspaceRoot, config, compilerOptions } = yield setupTypeScript(options);
|
|
@@ -111,11 +112,12 @@ function getFormattedDiagnostic(ts, workspaceRoot, diagnostic) {
|
|
|
111
112
|
const fileName = path.relative(workspaceRoot, diagnostic.file.fileName);
|
|
112
113
|
message =
|
|
113
114
|
`${chalk.underline.blue(`${fileName}:${line}:${column}`)} - ` + message;
|
|
115
|
+
const code = diagnostic.file.getFullText(diagnostic.file.getSourceFile());
|
|
114
116
|
message +=
|
|
115
117
|
'\n' +
|
|
116
|
-
(0, code_frames_1.codeFrameColumns)(
|
|
118
|
+
(0, code_frames_1.codeFrameColumns)(code, {
|
|
117
119
|
start: { line: line, column },
|
|
118
|
-
});
|
|
120
|
+
}, { highlight: highlight_1.highlight });
|
|
119
121
|
}
|
|
120
122
|
return message;
|
|
121
123
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-type-check.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/run-type-check.ts"],"names":[],"mappings":";;;;AAAA,yEAAwE;AACxE,+BAA+B;AAC/B,6BAA6B;AAE7B,
|
|
1
|
+
{"version":3,"file":"run-type-check.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/run-type-check.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { swcCoreVersion } from 'nx/src/utils/versions';
|
|
2
2
|
export declare const nxVersion: any;
|
|
3
|
-
export declare const esbuildVersion = "^0.
|
|
3
|
+
export declare const esbuildVersion = "^0.17.5";
|
|
4
4
|
export declare const swcCliVersion = "~0.1.55";
|
|
5
5
|
export declare const swcHelpersVersion = "~0.4.11";
|
|
6
6
|
export declare const typesNodeVersion = "18.7.1";
|
package/src/utils/versions.js
CHANGED
|
@@ -4,7 +4,7 @@ exports.typesNodeVersion = exports.swcHelpersVersion = exports.swcCliVersion = e
|
|
|
4
4
|
var versions_1 = require("nx/src/utils/versions");
|
|
5
5
|
Object.defineProperty(exports, "swcCoreVersion", { enumerable: true, get: function () { return versions_1.swcCoreVersion; } });
|
|
6
6
|
exports.nxVersion = require('../../package.json').version;
|
|
7
|
-
exports.esbuildVersion = '^0.
|
|
7
|
+
exports.esbuildVersion = '^0.17.5';
|
|
8
8
|
exports.swcCliVersion = '~0.1.55';
|
|
9
9
|
exports.swcHelpersVersion = '~0.4.11';
|
|
10
10
|
exports.typesNodeVersion = '18.7.1';
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
declare type Location = {
|
|
2
|
-
column: number;
|
|
3
|
-
line: number;
|
|
4
|
-
};
|
|
5
|
-
declare type NodeLocation = {
|
|
6
|
-
end?: Location;
|
|
7
|
-
start?: Location;
|
|
8
|
-
};
|
|
9
|
-
export declare function codeFrameColumns(rawLines: string, loc: NodeLocation, opts?: Object): string;
|
|
10
|
-
/**
|
|
11
|
-
* Create a code frame, adding line numbers, code highlighting, and pointing to a given position.
|
|
12
|
-
*/
|
|
13
|
-
export default function (rawLines: string, lineNumber: number, colNumber?: number, opts?: Object): string;
|
|
14
|
-
export {};
|
|
@@ -1,125 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.codeFrameColumns = void 0;
|
|
4
|
-
// Adapted from https://raw.githubusercontent.com/babel/babel/4108524/packages/babel-code-frame/src/index.js
|
|
5
|
-
const highlight_1 = require("./highlight");
|
|
6
|
-
const chalk = require("chalk");
|
|
7
|
-
/**
|
|
8
|
-
* Chalk styles for code frame token types.
|
|
9
|
-
*/
|
|
10
|
-
function getDefs(chalk) {
|
|
11
|
-
return {
|
|
12
|
-
gutter: chalk.grey,
|
|
13
|
-
marker: chalk.red.bold,
|
|
14
|
-
message: chalk.red.bold,
|
|
15
|
-
};
|
|
16
|
-
}
|
|
17
|
-
/**
|
|
18
|
-
* RegExp to test for newlines in terminal.
|
|
19
|
-
*/
|
|
20
|
-
const NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
|
|
21
|
-
/**
|
|
22
|
-
* Extract what lines should be marked and highlighted.
|
|
23
|
-
*/
|
|
24
|
-
function getMarkerLines(loc, source, opts) {
|
|
25
|
-
const startLoc = Object.assign({ column: 0, line: -1 }, loc.start);
|
|
26
|
-
const endLoc = Object.assign(Object.assign({}, startLoc), loc.end);
|
|
27
|
-
const { linesAbove = 2, linesBelow = 3 } = opts || {};
|
|
28
|
-
const startLine = startLoc.line;
|
|
29
|
-
const startColumn = startLoc.column;
|
|
30
|
-
const endLine = endLoc.line;
|
|
31
|
-
const endColumn = endLoc.column;
|
|
32
|
-
let start = Math.max(startLine - (linesAbove + 1), 0);
|
|
33
|
-
let end = Math.min(source.length, endLine + linesBelow);
|
|
34
|
-
if (startLine === -1) {
|
|
35
|
-
start = 0;
|
|
36
|
-
}
|
|
37
|
-
if (endLine === -1) {
|
|
38
|
-
end = source.length;
|
|
39
|
-
}
|
|
40
|
-
const lineDiff = endLine - startLine;
|
|
41
|
-
const markerLines = {};
|
|
42
|
-
if (lineDiff) {
|
|
43
|
-
for (let i = 0; i <= lineDiff; i++) {
|
|
44
|
-
const lineNumber = i + startLine;
|
|
45
|
-
if (!startColumn) {
|
|
46
|
-
markerLines[lineNumber] = true;
|
|
47
|
-
}
|
|
48
|
-
else if (i === 0) {
|
|
49
|
-
const sourceLength = source[lineNumber - 1].length;
|
|
50
|
-
markerLines[lineNumber] = [startColumn, sourceLength - startColumn + 1];
|
|
51
|
-
}
|
|
52
|
-
else if (i === lineDiff) {
|
|
53
|
-
markerLines[lineNumber] = [0, endColumn];
|
|
54
|
-
}
|
|
55
|
-
else {
|
|
56
|
-
const sourceLength = source[lineNumber - i].length;
|
|
57
|
-
markerLines[lineNumber] = [0, sourceLength];
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
else {
|
|
62
|
-
if (startColumn === endColumn) {
|
|
63
|
-
if (startColumn) {
|
|
64
|
-
markerLines[startLine] = [startColumn, 0];
|
|
65
|
-
}
|
|
66
|
-
else {
|
|
67
|
-
markerLines[startLine] = true;
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
else {
|
|
71
|
-
markerLines[startLine] = [startColumn, endColumn - startColumn];
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
return { start, end, markerLines };
|
|
75
|
-
}
|
|
76
|
-
function codeFrameColumns(rawLines, loc, opts = {}) {
|
|
77
|
-
const defs = getDefs(chalk);
|
|
78
|
-
const lines = rawLines.split(NEWLINE);
|
|
79
|
-
const { start, end, markerLines } = getMarkerLines(loc, lines, opts);
|
|
80
|
-
const numberMaxWidth = String(end).length;
|
|
81
|
-
const highlightedLines = (0, highlight_1.highlight)(rawLines);
|
|
82
|
-
let frame = highlightedLines
|
|
83
|
-
.split(NEWLINE)
|
|
84
|
-
.slice(start, end)
|
|
85
|
-
.map((line, index) => {
|
|
86
|
-
const number = start + 1 + index;
|
|
87
|
-
const paddedNumber = ` ${number}`.slice(-numberMaxWidth);
|
|
88
|
-
const gutter = ` ${paddedNumber} | `;
|
|
89
|
-
const hasMarker = markerLines[number];
|
|
90
|
-
if (hasMarker) {
|
|
91
|
-
let markerLine = '';
|
|
92
|
-
if (Array.isArray(hasMarker)) {
|
|
93
|
-
const markerSpacing = line
|
|
94
|
-
.slice(0, Math.max(hasMarker[0] - 1, 0))
|
|
95
|
-
.replace(/[^\t]/g, ' ');
|
|
96
|
-
const numberOfMarkers = hasMarker[1] || 1;
|
|
97
|
-
markerLine = [
|
|
98
|
-
'\n ',
|
|
99
|
-
defs.gutter(gutter.replace(/\d/g, ' ')),
|
|
100
|
-
markerSpacing,
|
|
101
|
-
defs.marker('^').repeat(numberOfMarkers),
|
|
102
|
-
].join('');
|
|
103
|
-
}
|
|
104
|
-
return [defs.marker('>'), defs.gutter(gutter), line, markerLine].join('');
|
|
105
|
-
}
|
|
106
|
-
else {
|
|
107
|
-
return ` ${defs.gutter(gutter)}${line}`;
|
|
108
|
-
}
|
|
109
|
-
})
|
|
110
|
-
.join('\n');
|
|
111
|
-
return chalk.reset(frame);
|
|
112
|
-
}
|
|
113
|
-
exports.codeFrameColumns = codeFrameColumns;
|
|
114
|
-
/**
|
|
115
|
-
* Create a code frame, adding line numbers, code highlighting, and pointing to a given position.
|
|
116
|
-
*/
|
|
117
|
-
function default_1(rawLines, lineNumber, colNumber, opts = {}) {
|
|
118
|
-
colNumber = Math.max(colNumber, 0);
|
|
119
|
-
const location = {
|
|
120
|
-
start: { column: colNumber, line: lineNumber },
|
|
121
|
-
};
|
|
122
|
-
return codeFrameColumns(rawLines, location, opts);
|
|
123
|
-
}
|
|
124
|
-
exports.default = default_1;
|
|
125
|
-
//# sourceMappingURL=code-frames.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"code-frames.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/code-frames/code-frames.ts"],"names":[],"mappings":"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"}
|