@sprucelabs/spruce-cli 22.1.8 → 22.1.10
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 +16 -0
- package/build/__tests__/behavioral/watchers/WatchingForChanges.test.d.ts +1 -0
- package/build/__tests__/behavioral/watchers/WatchingForChanges.test.js +6 -1
- package/build/__tests__/behavioral/watchers/WatchingForChanges.test.js.map +1 -1
- package/build/features/watch/WatchFeature.js +18 -21
- package/build/features/watch/WatchFeature.js.map +1 -1
- package/package.json +25 -25
- package/src/__tests__/behavioral/watchers/WatchingForChanges.test.ts +7 -1
- package/src/features/watch/WatchFeature.ts +25 -28
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,22 @@
|
|
|
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
|
+
## [22.1.10](https://github.com/sprucelabsai-community/spruce-cli-workspace/compare/v22.1.9...v22.1.10) (2024-10-18)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @sprucelabs/spruce-cli
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [22.1.9](https://github.com/sprucelabsai-community/spruce-cli-workspace/compare/v22.1.8...v22.1.9) (2024-10-13)
|
|
15
|
+
|
|
16
|
+
**Note:** Version bump only for package @sprucelabs/spruce-cli
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
6
22
|
## [22.1.8](https://github.com/sprucelabsai-community/spruce-cli-workspace/compare/v22.1.7...v22.1.8) (2024-10-12)
|
|
7
23
|
|
|
8
24
|
**Note:** Version bump only for package @sprucelabs/spruce-cli
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import AbstractCliTest from '../../../tests/AbstractCliTest';
|
|
2
2
|
import { GeneratedFileOrDir } from '../../../types/cli.types';
|
|
3
3
|
export default class WatchingForChangesTest extends AbstractCliTest {
|
|
4
|
+
protected static beforeEach(): Promise<void>;
|
|
4
5
|
protected static installsWatchers(): Promise<void>;
|
|
5
6
|
protected static notWatchingAtTheStart(): Promise<void>;
|
|
6
7
|
protected static canStartAndStopWatch(): Promise<void>;
|
|
@@ -13,6 +13,11 @@ const spruce_skill_utils_1 = require("@sprucelabs/spruce-skill-utils");
|
|
|
13
13
|
const test_utils_1 = require("@sprucelabs/test-utils");
|
|
14
14
|
const AbstractCliTest_1 = __importDefault(require("../../../tests/AbstractCliTest"));
|
|
15
15
|
class WatchingForChangesTest extends AbstractCliTest_1.default {
|
|
16
|
+
static async beforeEach() {
|
|
17
|
+
await super.beforeEach();
|
|
18
|
+
spruce_skill_utils_1.diskUtil.createDir(this.resolvePath('dist'));
|
|
19
|
+
spruce_skill_utils_1.diskUtil.createDir(this.resolvePath('build'));
|
|
20
|
+
}
|
|
16
21
|
static async installsWatchers() {
|
|
17
22
|
await this.installWatch();
|
|
18
23
|
await this.assertIsFeatureInstalled('watch');
|
|
@@ -158,7 +163,7 @@ class WatchingForChangesTest extends AbstractCliTest_1.default {
|
|
|
158
163
|
await feature.stopWatching();
|
|
159
164
|
}
|
|
160
165
|
static async startWatching(feature) {
|
|
161
|
-
void feature.startWatching({ delay:
|
|
166
|
+
void feature.startWatching({ delay: 0 });
|
|
162
167
|
await this.wait(1000);
|
|
163
168
|
}
|
|
164
169
|
static async watchRunStop(runner) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WatchingForChanges.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/watchers/WatchingForChanges.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,uEAA8E;AAC9E,uDAAqD;AAErD,qFAA4D;AAG5D,MAAqB,sBAAuB,SAAQ,yBAAe;
|
|
1
|
+
{"version":3,"file":"WatchingForChanges.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/watchers/WatchingForChanges.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,31 +21,28 @@ class WatchFeature extends AbstractFeature_1.default {
|
|
|
21
21
|
async startWatching(options) {
|
|
22
22
|
this._isWatching = true;
|
|
23
23
|
const watchDir = spruce_skill_utils_1.diskUtil.resolvePath(this.cwd, options?.sourceDir ?? '');
|
|
24
|
-
this.watcher = chokidar_1.default.watch(
|
|
25
|
-
ignoreInitial: true,
|
|
26
|
-
});
|
|
27
|
-
const startsWith = [
|
|
24
|
+
this.watcher = chokidar_1.default.watch([
|
|
28
25
|
spruce_skill_utils_1.diskUtil.resolvePath(watchDir, 'build'),
|
|
29
26
|
spruce_skill_utils_1.diskUtil.resolvePath(watchDir, 'dist'),
|
|
30
|
-
]
|
|
27
|
+
], {
|
|
28
|
+
ignoreInitial: true,
|
|
29
|
+
});
|
|
31
30
|
this.watcher.on('all', async (action, path) => {
|
|
32
|
-
|
|
33
|
-
this.
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
clearTimeout(this.timeoutId);
|
|
44
|
-
}
|
|
45
|
-
this.timeoutId = setTimeout(async () => {
|
|
46
|
-
await this.fireChange();
|
|
47
|
-
}, options?.delay ?? 500);
|
|
31
|
+
this.changesSinceLastChange.push({
|
|
32
|
+
schemaId: this.mapChokidarActionToSchemaId(action),
|
|
33
|
+
version: 'v2020_07_22',
|
|
34
|
+
values: {
|
|
35
|
+
action: this.mapChokidarActionToGeneratedAction(action),
|
|
36
|
+
path,
|
|
37
|
+
name: path_1.default.basename(path),
|
|
38
|
+
},
|
|
39
|
+
});
|
|
40
|
+
if (this.timeoutId) {
|
|
41
|
+
clearTimeout(this.timeoutId);
|
|
48
42
|
}
|
|
43
|
+
this.timeoutId = setTimeout(async () => {
|
|
44
|
+
await this.fireChange();
|
|
45
|
+
}, options?.delay ?? 500);
|
|
49
46
|
});
|
|
50
47
|
}
|
|
51
48
|
mapChokidarActionToSchemaId(action) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WatchFeature.js","sourceRoot":"","sources":["../../../src/features/watch/WatchFeature.ts"],"names":[],"mappings":";;;;;AAAA,gDAA2B;AAC3B,uEAAyD;AACzD,wDAA+B;AAE/B,yEAAgD;AAGhD,MAAqB,YAAa,SAAQ,yBAAe;IAC9C,WAAW,GACd,qGAAqG,CAAA;IAClG,IAAI,GAAgB,OAAO,CAAA;IAC3B,YAAY,GAAG,OAAO,CAAA;IAErB,WAAW,GAAG,KAAK,CAAA;IACnB,OAAO,CAAM;IAEb,SAAS,CAAiB;IAC1B,sBAAsB,GAAyB,EAAE,CAAA;IAElD,KAAK,CAAC,UAAU;QACnB,OAAO,IAAI,CAAC,WAAW,CAAA;IAC3B,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,OAG1B;QACG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;QAEvB,MAAM,QAAQ,GAAG,6BAAQ,CAAC,WAAW,CACjC,IAAI,CAAC,GAAG,EACR,OAAO,EAAE,SAAS,IAAI,EAAE,CAC3B,CAAA;QAED,IAAI,CAAC,OAAO,GAAG,kBAAQ,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"WatchFeature.js","sourceRoot":"","sources":["../../../src/features/watch/WatchFeature.ts"],"names":[],"mappings":";;;;;AAAA,gDAA2B;AAC3B,uEAAyD;AACzD,wDAA+B;AAE/B,yEAAgD;AAGhD,MAAqB,YAAa,SAAQ,yBAAe;IAC9C,WAAW,GACd,qGAAqG,CAAA;IAClG,IAAI,GAAgB,OAAO,CAAA;IAC3B,YAAY,GAAG,OAAO,CAAA;IAErB,WAAW,GAAG,KAAK,CAAA;IACnB,OAAO,CAAM;IAEb,SAAS,CAAiB;IAC1B,sBAAsB,GAAyB,EAAE,CAAA;IAElD,KAAK,CAAC,UAAU;QACnB,OAAO,IAAI,CAAC,WAAW,CAAA;IAC3B,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,OAG1B;QACG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;QAEvB,MAAM,QAAQ,GAAG,6BAAQ,CAAC,WAAW,CACjC,IAAI,CAAC,GAAG,EACR,OAAO,EAAE,SAAS,IAAI,EAAE,CAC3B,CAAA;QAED,IAAI,CAAC,OAAO,GAAG,kBAAQ,CAAC,KAAK,CACzB;YACI,6BAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC;YACvC,6BAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC;SACzC,EACD;YACI,aAAa,EAAE,IAAI;SACtB,CACJ,CAAA;QAED,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,MAAsB,EAAE,IAAY,EAAE,EAAE;YAClE,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC;gBAC7B,QAAQ,EAAE,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC;gBAClD,OAAO,EAAE,aAAa;gBACtB,MAAM,EAAE;oBACJ,MAAM,EAAE,IAAI,CAAC,kCAAkC,CAAC,MAAM,CAAC;oBACvD,IAAI;oBACJ,IAAI,EAAE,cAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;iBAChC;aACJ,CAAC,CAAA;YAEF,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACjB,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAChC,CAAC;YAED,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;gBACnC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;YAC3B,CAAC,EAAE,OAAO,EAAE,KAAK,IAAI,GAAG,CAAC,CAAA;QAC7B,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,2BAA2B,CAC/B,MAAsB;QAEtB,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe,CAAA;IACzE,CAAC;IAEO,kCAAkC,CAAC,QAAwB;QAC/D,MAAM,GAAG,GAAG;YACR,GAAG,EAAE,WAAW;YAChB,MAAM,EAAE,WAAW;YACnB,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,SAAS;SACvB,CAAA;QAED,OAAO,GAAG,CAAC,QAAQ,CAA4B,CAAA;IACnD,CAAC;IAEO,KAAK,CAAC,UAAU;QACpB,MAAM,OAAO,GAAG,IAAI,CAAC,sBAAsB,CAAA;QAC3C,IAAI,CAAC,sBAAsB,GAAG,EAAE,CAAA;QAEhC,MAAM,IAAI,CAAC,OAAO,CAAC,uBAAuB,CACtC,2BAA2B,EAC3B;YACI,OAAO;SACV,CACJ,CAAA;IACL,CAAC;IAEM,KAAK,CAAC,YAAY;QACrB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAA;QACxB,MAAM,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,CAAA;IAC/B,CAAC;CACJ;AA5FD,+BA4FC"}
|
package/package.json
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
]
|
|
18
18
|
},
|
|
19
19
|
"license": "MIT",
|
|
20
|
-
"version": "22.1.
|
|
20
|
+
"version": "22.1.10",
|
|
21
21
|
"bin": {
|
|
22
22
|
"spruce": "./build/index.js"
|
|
23
23
|
},
|
|
@@ -73,18 +73,18 @@
|
|
|
73
73
|
},
|
|
74
74
|
"dependencies": {
|
|
75
75
|
"@jest/reporters": "^29.7.0",
|
|
76
|
-
"@sprucelabs/error": "^6.0.
|
|
77
|
-
"@sprucelabs/globby": "^2.0.
|
|
78
|
-
"@sprucelabs/heartwood-view-controllers": "^110.12.
|
|
79
|
-
"@sprucelabs/jest-json-reporter": "^8.0.
|
|
80
|
-
"@sprucelabs/mercury-client": "^42.0.
|
|
81
|
-
"@sprucelabs/mercury-event-emitter": "^42.0.
|
|
82
|
-
"@sprucelabs/mercury-types": "^47.0.
|
|
83
|
-
"@sprucelabs/schema": "^30.0.
|
|
84
|
-
"@sprucelabs/spruce-core-schemas": "^40.1.
|
|
85
|
-
"@sprucelabs/spruce-event-utils": "^40.1.
|
|
86
|
-
"@sprucelabs/spruce-skill-utils": "^31.0.
|
|
87
|
-
"@sprucelabs/spruce-templates": "^22.1.
|
|
76
|
+
"@sprucelabs/error": "^6.0.485",
|
|
77
|
+
"@sprucelabs/globby": "^2.0.446",
|
|
78
|
+
"@sprucelabs/heartwood-view-controllers": "^110.12.166",
|
|
79
|
+
"@sprucelabs/jest-json-reporter": "^8.0.486",
|
|
80
|
+
"@sprucelabs/mercury-client": "^42.0.534",
|
|
81
|
+
"@sprucelabs/mercury-event-emitter": "^42.0.534",
|
|
82
|
+
"@sprucelabs/mercury-types": "^47.0.535",
|
|
83
|
+
"@sprucelabs/schema": "^30.0.495",
|
|
84
|
+
"@sprucelabs/spruce-core-schemas": "^40.1.481",
|
|
85
|
+
"@sprucelabs/spruce-event-utils": "^40.1.255",
|
|
86
|
+
"@sprucelabs/spruce-skill-utils": "^31.0.554",
|
|
87
|
+
"@sprucelabs/spruce-templates": "^22.1.10",
|
|
88
88
|
"@typescript-eslint/eslint-plugin": "^7.7.1",
|
|
89
89
|
"@typescript-eslint/parser": "^7.7.1",
|
|
90
90
|
"cfonts": "^3.3.0",
|
|
@@ -110,23 +110,23 @@
|
|
|
110
110
|
"uuid": "^10.0.0"
|
|
111
111
|
},
|
|
112
112
|
"devDependencies": {
|
|
113
|
-
"@sprucelabs/data-stores": "^28.3.
|
|
114
|
-
"@sprucelabs/jest-sheets-reporter": "^3.0.
|
|
115
|
-
"@sprucelabs/mercury-core-events": "^24.3.
|
|
116
|
-
"@sprucelabs/resolve-path-aliases": "^2.0.
|
|
117
|
-
"@sprucelabs/spruce-conversation-plugin": "^62.3.
|
|
118
|
-
"@sprucelabs/spruce-deploy-plugin": "^62.3.
|
|
119
|
-
"@sprucelabs/spruce-store-plugin": "^62.3.
|
|
120
|
-
"@sprucelabs/spruce-test-fixtures": "^62.3.
|
|
121
|
-
"@sprucelabs/test": "^9.0.
|
|
122
|
-
"@sprucelabs/test-utils": "^5.1.
|
|
113
|
+
"@sprucelabs/data-stores": "^28.3.147",
|
|
114
|
+
"@sprucelabs/jest-sheets-reporter": "^3.0.157",
|
|
115
|
+
"@sprucelabs/mercury-core-events": "^24.3.296",
|
|
116
|
+
"@sprucelabs/resolve-path-aliases": "^2.0.463",
|
|
117
|
+
"@sprucelabs/spruce-conversation-plugin": "^62.3.50",
|
|
118
|
+
"@sprucelabs/spruce-deploy-plugin": "^62.3.50",
|
|
119
|
+
"@sprucelabs/spruce-store-plugin": "^62.3.50",
|
|
120
|
+
"@sprucelabs/spruce-test-fixtures": "^62.3.50",
|
|
121
|
+
"@sprucelabs/test": "^9.0.51",
|
|
122
|
+
"@sprucelabs/test-utils": "^5.1.439",
|
|
123
123
|
"@types/blessed": "^0.1.25",
|
|
124
124
|
"@types/eslint": "^9.6.1",
|
|
125
125
|
"@types/fs-extra": "^11.0.4",
|
|
126
126
|
"@types/inquirer": "^9.0.7",
|
|
127
127
|
"@types/lodash": "^4.17.10",
|
|
128
128
|
"@types/md5": "^2.3.5",
|
|
129
|
-
"@types/node": "^22.7.
|
|
129
|
+
"@types/node": "^22.7.6",
|
|
130
130
|
"@types/promise.allsettled": "^1.0.6",
|
|
131
131
|
"@types/ps-node": "^0.1.3",
|
|
132
132
|
"@types/semver": "^7.5.8",
|
|
@@ -588,5 +588,5 @@
|
|
|
588
588
|
"open"
|
|
589
589
|
]
|
|
590
590
|
},
|
|
591
|
-
"gitHead": "
|
|
591
|
+
"gitHead": "aa8b7598c2a5fd57af900ab523b23b7c4ece2bee"
|
|
592
592
|
}
|
|
@@ -5,6 +5,12 @@ import AbstractCliTest from '../../../tests/AbstractCliTest'
|
|
|
5
5
|
import { GeneratedFileOrDir } from '../../../types/cli.types'
|
|
6
6
|
|
|
7
7
|
export default class WatchingForChangesTest extends AbstractCliTest {
|
|
8
|
+
protected static async beforeEach(): Promise<void> {
|
|
9
|
+
await super.beforeEach()
|
|
10
|
+
diskUtil.createDir(this.resolvePath('dist'))
|
|
11
|
+
diskUtil.createDir(this.resolvePath('build'))
|
|
12
|
+
}
|
|
13
|
+
|
|
8
14
|
@test()
|
|
9
15
|
protected static async installsWatchers() {
|
|
10
16
|
await this.installWatch()
|
|
@@ -213,7 +219,7 @@ export default class WatchingForChangesTest extends AbstractCliTest {
|
|
|
213
219
|
}
|
|
214
220
|
|
|
215
221
|
private static async startWatching(feature: WatchFeature) {
|
|
216
|
-
void feature.startWatching({ delay:
|
|
222
|
+
void feature.startWatching({ delay: 0 })
|
|
217
223
|
await this.wait(1000)
|
|
218
224
|
}
|
|
219
225
|
|
|
@@ -32,37 +32,34 @@ export default class WatchFeature extends AbstractFeature {
|
|
|
32
32
|
options?.sourceDir ?? ''
|
|
33
33
|
)
|
|
34
34
|
|
|
35
|
-
this.watcher = chokidar.watch(
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
35
|
+
this.watcher = chokidar.watch(
|
|
36
|
+
[
|
|
37
|
+
diskUtil.resolvePath(watchDir, 'build'),
|
|
38
|
+
diskUtil.resolvePath(watchDir, 'dist'),
|
|
39
|
+
],
|
|
40
|
+
{
|
|
41
|
+
ignoreInitial: true,
|
|
42
|
+
}
|
|
43
|
+
)
|
|
43
44
|
|
|
44
45
|
this.watcher.on('all', async (action: ChokidarAction, path: string) => {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
if (this.timeoutId) {
|
|
59
|
-
clearTimeout(this.timeoutId)
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
this.timeoutId = setTimeout(async () => {
|
|
63
|
-
await this.fireChange()
|
|
64
|
-
}, options?.delay ?? 500)
|
|
46
|
+
this.changesSinceLastChange.push({
|
|
47
|
+
schemaId: this.mapChokidarActionToSchemaId(action),
|
|
48
|
+
version: 'v2020_07_22',
|
|
49
|
+
values: {
|
|
50
|
+
action: this.mapChokidarActionToGeneratedAction(action),
|
|
51
|
+
path,
|
|
52
|
+
name: pathUtil.basename(path),
|
|
53
|
+
},
|
|
54
|
+
})
|
|
55
|
+
|
|
56
|
+
if (this.timeoutId) {
|
|
57
|
+
clearTimeout(this.timeoutId)
|
|
65
58
|
}
|
|
59
|
+
|
|
60
|
+
this.timeoutId = setTimeout(async () => {
|
|
61
|
+
await this.fireChange()
|
|
62
|
+
}, options?.delay ?? 500)
|
|
66
63
|
})
|
|
67
64
|
}
|
|
68
65
|
|