@nrwl/js 14.8.8 → 14.9.0-beta.1

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.
Files changed (129) hide show
  1. package/CHANGELOG.md +1 -1
  2. package/LICENSE +22 -22
  3. package/README.md +5 -26
  4. package/babel.d.ts +10 -0
  5. package/babel.js +89 -0
  6. package/babel.js.map +1 -0
  7. package/generators.json +4 -2
  8. package/migrations.json +20 -1
  9. package/package.json +19 -10
  10. package/src/executors/node/node.impl.js +36 -28
  11. package/src/executors/node/node.impl.js.map +1 -1
  12. package/src/executors/node/schema.json +3 -1
  13. package/src/executors/swc/schema.json +39 -5
  14. package/src/executors/swc/swc.impl.d.ts +4 -0
  15. package/src/executors/swc/swc.impl.js +56 -6
  16. package/src/executors/swc/swc.impl.js.map +1 -1
  17. package/src/executors/tsc/schema.json +36 -3
  18. package/src/executors/tsc/tsc.impl.d.ts +2 -5
  19. package/src/executors/tsc/tsc.impl.js +35 -13
  20. package/src/executors/tsc/tsc.impl.js.map +1 -1
  21. package/src/generators/convert-to-swc/convert-to-swc.js +2 -4
  22. package/src/generators/convert-to-swc/convert-to-swc.js.map +1 -1
  23. package/src/generators/init/files/__fileName__ +20 -0
  24. package/src/generators/init/init.d.ts +4 -2
  25. package/src/generators/init/init.js +59 -2
  26. package/src/generators/init/init.js.map +1 -1
  27. package/src/generators/init/schema.d.ts +6 -0
  28. package/src/generators/init/schema.json +24 -1
  29. package/src/generators/library/files/jest-config/jest.config.__ext__ +8 -1
  30. package/src/generators/library/files/lib/tsconfig.lib.json__tmpl__ +2 -2
  31. package/src/generators/library/library.js +136 -85
  32. package/src/generators/library/library.js.map +1 -1
  33. package/src/generators/library/schema.json +29 -19
  34. package/src/index.d.ts +8 -0
  35. package/src/index.js +12 -1
  36. package/src/index.js.map +1 -1
  37. package/src/migrations/update-13-10-1/update-lib-swcrc-exclude.js +1 -1
  38. package/src/migrations/update-13-10-1/update-lib-swcrc-exclude.js.map +1 -1
  39. package/src/migrations/update-13-8-5/update-swcrc.js +2 -2
  40. package/src/migrations/update-13-8-5/update-swcrc.js.map +1 -1
  41. package/src/migrations/update-14-0-0/exclude-jest-config-swcrc.js +1 -1
  42. package/src/migrations/update-14-0-0/exclude-jest-config-swcrc.js.map +1 -1
  43. package/src/migrations/update-14-1-5/update-swcrc-path.js +1 -1
  44. package/src/migrations/update-14-1-5/update-swcrc-path.js.map +1 -1
  45. package/src/migrations/update-15-8-0/rename-swcrc-config.d.ts +2 -0
  46. package/src/migrations/update-15-8-0/rename-swcrc-config.js +81 -0
  47. package/src/migrations/update-15-8-0/rename-swcrc-config.js.map +1 -0
  48. package/src/utils/add-babel-inputs.d.ts +2 -0
  49. package/src/utils/add-babel-inputs.js +27 -0
  50. package/src/utils/add-babel-inputs.js.map +1 -0
  51. package/src/utils/assets/copy-assets-handler.d.ts +2 -2
  52. package/src/utils/assets/copy-assets-handler.js +12 -5
  53. package/src/utils/assets/copy-assets-handler.js.map +1 -1
  54. package/src/utils/assets/index.js +11 -14
  55. package/src/utils/assets/index.js.map +1 -1
  56. package/src/utils/buildable-libs-utils.d.ts +32 -0
  57. package/src/utils/buildable-libs-utils.js +309 -0
  58. package/src/utils/buildable-libs-utils.js.map +1 -0
  59. package/src/utils/check-dependencies.d.ts +2 -2
  60. package/src/utils/check-dependencies.js +1 -1
  61. package/src/utils/check-dependencies.js.map +1 -1
  62. package/src/utils/code-frames/identifiers.d.ts +0 -20
  63. package/src/utils/code-frames/identifiers.js +38 -184
  64. package/src/utils/code-frames/identifiers.js.map +1 -1
  65. package/src/utils/compiler-helper-dependency.d.ts +1 -1
  66. package/src/utils/compiler-helper-dependency.js +2 -2
  67. package/src/utils/compiler-helper-dependency.js.map +1 -1
  68. package/src/utils/generate-globs.d.ts +6 -0
  69. package/src/utils/generate-globs.js +81 -0
  70. package/src/utils/generate-globs.js.map +1 -0
  71. package/src/utils/inline.d.ts +19 -0
  72. package/src/utils/inline.js +210 -0
  73. package/src/utils/inline.js.map +1 -0
  74. package/src/utils/package-json/index.d.ts +2 -1
  75. package/src/utils/package-json/index.js +6 -5
  76. package/src/utils/package-json/index.js.map +1 -1
  77. package/src/utils/package-json/update-package-json.d.ts +4 -2
  78. package/src/utils/package-json/update-package-json.js +96 -16
  79. package/src/utils/package-json/update-package-json.js.map +1 -1
  80. package/src/utils/prettier.d.ts +6 -0
  81. package/src/utils/prettier.js +38 -0
  82. package/src/utils/prettier.js.map +1 -0
  83. package/src/utils/schema.d.ts +8 -3
  84. package/src/utils/swc/add-swc-config.d.ts +1 -1
  85. package/src/utils/swc/add-swc-config.js +7 -7
  86. package/src/utils/swc/add-swc-config.js.map +1 -1
  87. package/src/utils/swc/compile-swc.d.ts +4 -0
  88. package/src/utils/swc/compile-swc.js +10 -7
  89. package/src/utils/swc/compile-swc.js.map +1 -1
  90. package/src/utils/swc/get-swcrc-path.d.ts +1 -1
  91. package/src/utils/swc/get-swcrc-path.js +7 -4
  92. package/src/utils/swc/get-swcrc-path.js.map +1 -1
  93. package/src/utils/swc/inline.d.ts +2 -0
  94. package/src/utils/swc/inline.js +13 -0
  95. package/src/utils/swc/inline.js.map +1 -0
  96. package/src/utils/typescript/ast-utils.d.ts +22 -0
  97. package/src/utils/typescript/ast-utils.js +199 -0
  98. package/src/utils/typescript/ast-utils.js.map +1 -0
  99. package/src/utils/typescript/compile-typescript-files.d.ts +6 -2
  100. package/src/utils/typescript/compile-typescript-files.js +16 -10
  101. package/src/utils/typescript/compile-typescript-files.js.map +1 -1
  102. package/src/utils/typescript/create-ts-config.d.ts +17 -0
  103. package/src/utils/typescript/create-ts-config.js +48 -0
  104. package/src/utils/typescript/create-ts-config.js.map +1 -0
  105. package/src/utils/typescript/ensure-typescript.d.ts +1 -0
  106. package/src/utils/typescript/ensure-typescript.js +10 -0
  107. package/src/utils/typescript/ensure-typescript.js.map +1 -0
  108. package/src/utils/typescript/get-source-nodes.d.ts +2 -0
  109. package/src/utils/typescript/get-source-nodes.js +19 -0
  110. package/src/utils/typescript/get-source-nodes.js.map +1 -0
  111. package/src/utils/typescript/run-type-check.d.ts +2 -2
  112. package/src/utils/typescript/run-type-check.js +7 -5
  113. package/src/utils/typescript/run-type-check.js.map +1 -1
  114. package/src/utils/typescript/ts-config.d.ts +11 -0
  115. package/src/utils/typescript/ts-config.js +55 -0
  116. package/src/utils/typescript/ts-config.js.map +1 -0
  117. package/src/utils/typescript/types.d.ts +2 -2
  118. package/src/utils/versions.d.ts +4 -2
  119. package/src/utils/versions.js +5 -3
  120. package/src/utils/versions.js.map +1 -1
  121. package/src/utils/watch-for-single-file-changes.d.ts +1 -1
  122. package/src/utils/watch-for-single-file-changes.js +11 -13
  123. package/src/utils/watch-for-single-file-changes.js.map +1 -1
  124. package/src/utils/code-frames/code-frames.d.ts +0 -14
  125. package/src/utils/code-frames/code-frames.js +0 -125
  126. package/src/utils/code-frames/code-frames.js.map +0 -1
  127. package/src/utils/create-async-iterable/create-async-iteratable.d.ts +0 -6
  128. package/src/utils/create-async-iterable/create-async-iteratable.js +0 -62
  129. package/src/utils/create-async-iterable/create-async-iteratable.js.map +0 -1
@@ -2,10 +2,11 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getFormattedDiagnostic = exports.runTypeCheck = exports.runTypeCheckWatch = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
6
5
  const chalk = require("chalk");
7
6
  const path = require("path");
8
- const code_frames_1 = require("../code-frames/code-frames");
7
+ const code_frames_1 = require("nx/src/utils/code-frames");
8
+ const highlight_1 = require("../code-frames/highlight");
9
+ const ts_config_1 = require("../../utils/typescript/ts-config");
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);
@@ -57,7 +58,7 @@ function setupTypeScript(options) {
57
58
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
58
59
  const ts = yield Promise.resolve().then(() => require('typescript'));
59
60
  const { workspaceRoot, tsConfigPath, cacheDir, incremental, rootDir } = options;
60
- const config = (0, typescript_1.readTsConfig)(tsConfigPath);
61
+ const config = (0, ts_config_1.readTsConfig)(tsConfigPath);
61
62
  if (config.errors.length) {
62
63
  throw new Error(`Invalid config file: ${config.errors}`);
63
64
  }
@@ -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)(diagnostic.file.getFullText(diagnostic.file.getSourceFile()), {
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":"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"}
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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"}
@@ -0,0 +1,11 @@
1
+ import { Tree } from '@nrwl/devkit';
2
+ export declare function readTsConfig(tsConfigPath: string): import("typescript").ParsedCommandLine;
3
+ export declare function getRootTsConfigPathInTree(tree: Tree): string | null;
4
+ export declare function getRelativePathToRootTsConfig(tree: Tree, targetPath: string): string;
5
+ export declare function getRootTsConfigFileName(tree: Tree): string | null;
6
+ export declare function updateRootTsConfig(host: Tree, options: {
7
+ name: string;
8
+ importPath?: string;
9
+ projectRoot: string;
10
+ js?: boolean;
11
+ }): void;
@@ -0,0 +1,55 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.updateRootTsConfig = exports.getRootTsConfigFileName = exports.getRelativePathToRootTsConfig = exports.getRootTsConfigPathInTree = exports.readTsConfig = void 0;
4
+ const devkit_1 = require("@nrwl/devkit");
5
+ const path_1 = require("path");
6
+ let tsModule;
7
+ function readTsConfig(tsConfigPath) {
8
+ if (!tsModule) {
9
+ tsModule = require('typescript');
10
+ }
11
+ const readResult = tsModule.readConfigFile(tsConfigPath, tsModule.sys.readFile);
12
+ return tsModule.parseJsonConfigFileContent(readResult.config, tsModule.sys, (0, path_1.dirname)(tsConfigPath));
13
+ }
14
+ exports.readTsConfig = readTsConfig;
15
+ function getRootTsConfigPathInTree(tree) {
16
+ for (const path of ['tsconfig.base.json', 'tsconfig.json']) {
17
+ if (tree.exists(path)) {
18
+ return path;
19
+ }
20
+ }
21
+ return 'tsconfig.base.json';
22
+ }
23
+ exports.getRootTsConfigPathInTree = getRootTsConfigPathInTree;
24
+ function getRelativePathToRootTsConfig(tree, targetPath) {
25
+ return (0, devkit_1.offsetFromRoot)(targetPath) + getRootTsConfigPathInTree(tree);
26
+ }
27
+ exports.getRelativePathToRootTsConfig = getRelativePathToRootTsConfig;
28
+ function getRootTsConfigFileName(tree) {
29
+ for (const tsConfigName of ['tsconfig.base.json', 'tsconfig.json']) {
30
+ if (tree.exists(tsConfigName)) {
31
+ return tsConfigName;
32
+ }
33
+ }
34
+ return null;
35
+ }
36
+ exports.getRootTsConfigFileName = getRootTsConfigFileName;
37
+ function updateRootTsConfig(host, options) {
38
+ if (!options.importPath) {
39
+ throw new Error(`Unable to update ${options.name} using the import path "${options.importPath}". Make sure to specify a valid import path one.`);
40
+ }
41
+ (0, devkit_1.updateJson)(host, getRootTsConfigPathInTree(host), (json) => {
42
+ const c = json.compilerOptions;
43
+ c.paths = c.paths || {};
44
+ delete c.paths[options.name];
45
+ if (c.paths[options.importPath]) {
46
+ throw new Error(`You already have a library using the import path "${options.importPath}". Make sure to specify a unique one.`);
47
+ }
48
+ c.paths[options.importPath] = [
49
+ (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
50
+ ];
51
+ return json;
52
+ });
53
+ }
54
+ exports.updateRootTsConfig = updateRootTsConfig;
55
+ //# sourceMappingURL=ts-config.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ts-config.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/ts-config.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAEtB,+BAAqC;AAErC,IAAI,QAAqC,CAAC;AAE1C,SAAgB,YAAY,CAAC,YAAoB;IAC/C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;IACD,MAAM,UAAU,GAAG,QAAQ,CAAC,cAAc,CACxC,YAAY,EACZ,QAAQ,CAAC,GAAG,CAAC,QAAQ,CACtB,CAAC;IACF,OAAO,QAAQ,CAAC,0BAA0B,CACxC,UAAU,CAAC,MAAM,EACjB,QAAQ,CAAC,GAAG,EACZ,IAAA,cAAO,EAAC,YAAY,CAAC,CACtB,CAAC;AACJ,CAAC;AAbD,oCAaC;AAED,SAAgB,yBAAyB,CAAC,IAAU;IAClD,KAAK,MAAM,IAAI,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE;QAC1D,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACrB,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AARD,8DAQC;AAED,SAAgB,6BAA6B,CAC3C,IAAU,EACV,UAAkB;IAElB,OAAO,IAAA,uBAAc,EAAC,UAAU,CAAC,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;AACtE,CAAC;AALD,sEAKC;AAED,SAAgB,uBAAuB,CAAC,IAAU;IAChD,KAAK,MAAM,YAAY,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE;QAClE,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;YAC7B,OAAO,YAAY,CAAC;SACrB;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AARD,0DAQC;AAED,SAAgB,kBAAkB,CAChC,IAAU,EACV,OAKC;IAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,MAAM,IAAI,KAAK,CACb,oBAAoB,OAAO,CAAC,IAAI,2BAA2B,OAAO,CAAC,UAAU,kDAAkD,CAChI,CAAC;KACH;IACD,IAAA,mBAAU,EAAC,IAAI,EAAE,yBAAyB,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,IAAA,0BAAiB,EACf,OAAO,CAAC,WAAW,EACnB,OAAO,EACP,QAAQ,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CACtC;SACF,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAnCD,gDAmCC"}
@@ -1,10 +1,10 @@
1
1
  import type { CustomTransformerFactory, Node, Program, TransformerFactory as TypescriptTransformerFactory } from 'typescript';
2
- declare type TransformerFactory = TypescriptTransformerFactory<Node> | CustomTransformerFactory;
2
+ type TransformerFactory = TypescriptTransformerFactory<Node> | CustomTransformerFactory;
3
3
  export interface TransformerPlugin {
4
4
  name: string;
5
5
  options: Record<string, unknown>;
6
6
  }
7
- export declare type TransformerEntry = string | TransformerPlugin;
7
+ export type TransformerEntry = string | TransformerPlugin;
8
8
  export interface CompilerPlugin {
9
9
  before?: (options?: Record<string, unknown>, program?: Program) => TransformerFactory;
10
10
  after?: (options?: Record<string, unknown>, program?: Program) => TransformerFactory;
@@ -1,6 +1,8 @@
1
1
  export { swcCoreVersion } from 'nx/src/utils/versions';
2
2
  export declare const nxVersion: any;
3
- export declare const esbuildVersion = "^0.15.7";
3
+ export declare const esbuildVersion = "^0.17.5";
4
+ export declare const prettierVersion = "^2.6.2";
4
5
  export declare const swcCliVersion = "~0.1.55";
5
- export declare const swcHelpersVersion = "~0.3.3";
6
+ export declare const swcHelpersVersion = "~0.4.11";
6
7
  export declare const typesNodeVersion = "18.7.1";
8
+ export declare const typescriptVersion = "~4.9.5";
@@ -1,11 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.typesNodeVersion = exports.swcHelpersVersion = exports.swcCliVersion = exports.esbuildVersion = exports.nxVersion = exports.swcCoreVersion = void 0;
3
+ exports.typescriptVersion = exports.typesNodeVersion = exports.swcHelpersVersion = exports.swcCliVersion = exports.prettierVersion = exports.esbuildVersion = exports.nxVersion = exports.swcCoreVersion = void 0;
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.15.7';
7
+ exports.esbuildVersion = '^0.17.5';
8
+ exports.prettierVersion = '^2.6.2';
8
9
  exports.swcCliVersion = '~0.1.55';
9
- exports.swcHelpersVersion = '~0.3.3';
10
+ exports.swcHelpersVersion = '~0.4.11';
10
11
  exports.typesNodeVersion = '18.7.1';
12
+ exports.typescriptVersion = '~4.9.5';
11
13
  //# sourceMappingURL=versions.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/versions.ts"],"names":[],"mappings":";;;AAAA,kDAAuD;AAA9C,0GAAA,cAAc,OAAA;AAEV,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,gBAAgB,GAAG,QAAQ,CAAC"}
1
+ {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/versions.ts"],"names":[],"mappings":";;;AAAA,kDAAuD;AAA9C,0GAAA,cAAc,OAAA;AAEV,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,iBAAiB,GAAG,QAAQ,CAAC"}
@@ -1 +1 @@
1
- export declare function watchForSingleFileChanges(watchDir: string, relativeFilePath: string, callback: () => void): Promise<() => Promise<void>>;
1
+ export declare function watchForSingleFileChanges(projectName: string, projectRoot: string, relativeFilePath: string, callback: () => void): Promise<() => void>;
@@ -3,26 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.watchForSingleFileChanges = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const devkit_1 = require("@nrwl/devkit");
6
+ const client_1 = require("nx/src/daemon/client/client");
6
7
  const path_1 = require("path");
7
- function watchForSingleFileChanges(watchDir, relativeFilePath, callback) {
8
+ function watchForSingleFileChanges(projectName, projectRoot, relativeFilePath, callback) {
8
9
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
9
- const watcher = yield Promise.resolve().then(() => require('@parcel/watcher'));
10
- const subscription = yield watcher.subscribe(watchDir, (err, events) => {
10
+ const unregisterFileWatcher = yield client_1.daemonClient.registerFileWatcher({ watchProjects: [projectName] }, (err, data) => {
11
11
  var _a;
12
- const file = (0, path_1.join)(watchDir, relativeFilePath);
13
- if (err) {
12
+ if (err === 'closed') {
13
+ devkit_1.logger.error(`Watch error: Daemon closed the connection`);
14
+ process.exit(1);
15
+ }
16
+ else if (err) {
14
17
  devkit_1.logger.error(`Watch error: ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : 'Unknown'}`);
15
18
  }
16
- else {
17
- for (const event of events) {
18
- if (event.path === file) {
19
- callback();
20
- break;
21
- }
22
- }
19
+ else if (data.changedFiles.some((file) => file.path == (0, path_1.join)(projectRoot, relativeFilePath))) {
20
+ callback();
23
21
  }
24
22
  });
25
- return () => subscription.unsubscribe();
23
+ return () => unregisterFileWatcher();
26
24
  });
27
25
  }
28
26
  exports.watchForSingleFileChanges = watchForSingleFileChanges;
@@ -1 +1 @@
1
- {"version":3,"file":"watch-for-single-file-changes.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/watch-for-single-file-changes.ts"],"names":[],"mappings":";;;;AAAA,yCAAsC;AACtC,+BAA4B;AAE5B,SAAsB,yBAAyB,CAC7C,QAAgB,EAChB,gBAAwB,EACxB,QAAoB;;QAEpB,MAAM,OAAO,GAAG,2CAAa,iBAAiB,EAAC,CAAC;QAChD,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;;YACrE,MAAM,IAAI,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;YAC9C,IAAI,GAAG,EAAE;gBACP,eAAM,CAAC,KAAK,CAAC,gBAAgB,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,mCAAI,SAAS,EAAE,CAAC,CAAC;aAC3D;iBAAM;gBACL,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;oBAC1B,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE;wBACvB,QAAQ,EAAE,CAAC;wBACX,MAAM;qBACP;iBACF;aACF;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;CAAA;AArBD,8DAqBC"}
1
+ {"version":3,"file":"watch-for-single-file-changes.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/watch-for-single-file-changes.ts"],"names":[],"mappings":";;;;AAAA,yCAAsC;AACtC,wDAA2D;AAC3D,+BAA4B;AAE5B,SAAsB,yBAAyB,CAC7C,WAAmB,EACnB,WAAmB,EACnB,gBAAwB,EACxB,QAAoB;;QAEpB,MAAM,qBAAqB,GAAG,MAAM,qBAAY,CAAC,mBAAmB,CAClE,EAAE,aAAa,EAAE,CAAC,WAAW,CAAC,EAAE,EAChC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;;YACZ,IAAI,GAAG,KAAK,QAAQ,EAAE;gBACpB,eAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;gBAC1D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;iBAAM,IAAI,GAAG,EAAE;gBACd,eAAM,CAAC,KAAK,CAAC,gBAAgB,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,mCAAI,SAAS,EAAE,CAAC,CAAC;aAC3D;iBAAM,IACL,IAAI,CAAC,YAAY,CAAC,IAAI,CACpB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,IAAA,WAAI,EAAC,WAAW,EAAE,gBAAgB,CAAC,CAC3D,EACD;gBACA,QAAQ,EAAE,CAAC;aACZ;QACH,CAAC,CACF,CAAC;QAEF,OAAO,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAAC;IACvC,CAAC;CAAA;AAzBD,8DAyBC"}
@@ -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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"}
@@ -1,6 +0,0 @@
1
- export interface AsyncPushCallbacks<T> {
2
- next: (value: T) => void;
3
- done: () => void;
4
- error: (err: unknown) => void;
5
- }
6
- export declare function createAsyncIterable<T = unknown>(listener: (ls: AsyncPushCallbacks<T>) => void): AsyncIterable<T>;
@@ -1,62 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.createAsyncIterable = void 0;
4
- function createAsyncIterable(listener) {
5
- let done = false;
6
- let error = null;
7
- const pushQueue = [];
8
- const pullQueue = [];
9
- return {
10
- [Symbol.asyncIterator]() {
11
- listener({
12
- next: (value) => {
13
- var _a;
14
- if (done || error)
15
- return;
16
- if (pullQueue.length > 0) {
17
- (_a = pullQueue.shift()) === null || _a === void 0 ? void 0 : _a[0]({ value, done: false });
18
- }
19
- else {
20
- pushQueue.push(value);
21
- }
22
- },
23
- error: (err) => {
24
- var _a;
25
- if (done || error)
26
- return;
27
- if (pullQueue.length > 0) {
28
- (_a = pullQueue.shift()) === null || _a === void 0 ? void 0 : _a[1](err);
29
- }
30
- error = err;
31
- },
32
- done: () => {
33
- var _a;
34
- if (pullQueue.length > 0) {
35
- (_a = pullQueue.shift()) === null || _a === void 0 ? void 0 : _a[0]({ value: undefined, done: true });
36
- }
37
- done = true;
38
- },
39
- });
40
- return {
41
- next() {
42
- return new Promise((resolve, reject) => {
43
- if (pushQueue.length > 0) {
44
- resolve({ value: pushQueue.shift(), done: false });
45
- }
46
- else if (done) {
47
- resolve({ value: undefined, done: true });
48
- }
49
- else if (error) {
50
- reject(error);
51
- }
52
- else {
53
- pullQueue.push([resolve, reject]);
54
- }
55
- });
56
- },
57
- };
58
- },
59
- };
60
- }
61
- exports.createAsyncIterable = createAsyncIterable;
62
- //# sourceMappingURL=create-async-iteratable.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"create-async-iteratable.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/create-async-iterable/create-async-iteratable.ts"],"names":[],"mappings":";;;AAMA,SAAgB,mBAAmB,CACjC,QAA6C;IAE7C,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,KAAK,GAAmB,IAAI,CAAC;IAEjC,MAAM,SAAS,GAAQ,EAAE,CAAC;IAC1B,MAAM,SAAS,GAKX,EAAE,CAAC;IAEP,OAAO;QACL,CAAC,MAAM,CAAC,aAAa,CAAC;YACpB,QAAQ,CAAC;gBACP,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;;oBACd,IAAI,IAAI,IAAI,KAAK;wBAAE,OAAO;oBAC1B,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;wBACxB,MAAA,SAAS,CAAC,KAAK,EAAE,0CAAG,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;qBAChD;yBAAM;wBACL,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;qBACvB;gBACH,CAAC;gBACD,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE;;oBACb,IAAI,IAAI,IAAI,KAAK;wBAAE,OAAO;oBAC1B,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;wBACxB,MAAA,SAAS,CAAC,KAAK,EAAE,0CAAG,CAAC,EAAE,GAAG,CAAC,CAAC;qBAC7B;oBACD,KAAK,GAAG,GAAG,CAAC;gBACd,CAAC;gBACD,IAAI,EAAE,GAAG,EAAE;;oBACT,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;wBACxB,MAAA,SAAS,CAAC,KAAK,EAAE,0CAAG,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;qBAC1D;oBACD,IAAI,GAAG,IAAI,CAAC;gBACd,CAAC;aACF,CAAC,CAAC;YAEH,OAAO;gBACL,IAAI;oBACF,OAAO,IAAI,OAAO,CAChB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;wBAClB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;4BACxB,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;yBACpD;6BAAM,IAAI,IAAI,EAAE;4BACf,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;yBAC3C;6BAAM,IAAI,KAAK,EAAE;4BAChB,MAAM,CAAC,KAAK,CAAC,CAAC;yBACf;6BAAM;4BACL,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;yBACnC;oBACH,CAAC,CACF,CAAC;gBACJ,CAAC;aACF,CAAC;QACJ,CAAC;KACkB,CAAC;AACxB,CAAC;AA3DD,kDA2DC"}