@sprucelabs/spruce-cli 21.1.0 → 22.0.0
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 +11 -0
- package/build/__tests__/behavioral/{CreatingAConversationTopic.test.d.ts → conversations/CreatingAConversationTopic.test.d.ts} +1 -1
- package/build/__tests__/behavioral/{CreatingAConversationTopic.test.js → conversations/CreatingAConversationTopic.test.js} +2 -2
- package/build/__tests__/behavioral/conversations/CreatingAConversationTopic.test.js.map +1 -0
- package/build/__tests__/behavioral/{RegisteringConversationsOnBoot.test.d.ts → conversations/RegisteringConversationsOnBoot.test.d.ts} +1 -1
- package/build/__tests__/behavioral/{RegisteringConversationsOnBoot.test.js → conversations/RegisteringConversationsOnBoot.test.js} +1 -1
- package/build/__tests__/behavioral/conversations/RegisteringConversationsOnBoot.test.js.map +1 -0
- package/build/__tests__/behavioral/{TestingAConversation.test.d.ts → conversations/TestingAConversation.test.d.ts} +1 -1
- package/build/__tests__/behavioral/{TestingAConversation.test.js → conversations/TestingAConversation.test.js} +2 -2
- package/build/__tests__/behavioral/conversations/TestingAConversation.test.js.map +1 -0
- package/build/__tests__/behavioral/events/KeepingListenersInSync.test.d.ts +1 -1
- package/build/__tests__/behavioral/events/KeepingListenersInSync.test.js +2 -2
- package/build/__tests__/behavioral/events/KeepingListenersInSync.test.js.map +1 -1
- package/build/__tests__/behavioral/{GettingCliVersion.test.d.ts → versions/GettingCliVersion.test.d.ts} +1 -1
- package/build/__tests__/behavioral/{GettingCliVersion.test.js → versions/GettingCliVersion.test.js} +4 -4
- package/build/__tests__/behavioral/versions/GettingCliVersion.test.js.map +1 -0
- package/build/__tests__/behavioral/versions/ResolvingVersions.test.d.ts +24 -0
- package/build/__tests__/behavioral/versions/ResolvingVersions.test.js +140 -0
- package/build/__tests__/behavioral/versions/ResolvingVersions.test.js.map +1 -0
- package/build/__tests__/behavioral/views/CreatingASkillView.test.d.ts +2 -0
- package/build/__tests__/behavioral/views/CreatingASkillView.test.js +20 -6
- package/build/__tests__/behavioral/views/CreatingASkillView.test.js.map +1 -1
- package/build/features/AbstractAction.d.ts +0 -1
- package/build/features/AbstractAction.js +3 -40
- package/build/features/AbstractAction.js.map +1 -1
- package/build/features/VersionResolver.d.ts +12 -0
- package/build/features/VersionResolver.js +88 -0
- package/build/features/VersionResolver.js.map +1 -0
- package/build/features/view/actions/CreateAction.js +3 -2
- package/build/features/view/actions/CreateAction.js.map +1 -1
- package/build/features/view/writers/ViewWriter.d.ts +1 -1
- package/build/features/view/writers/ViewWriter.js +4 -3
- package/build/features/view/writers/ViewWriter.js.map +1 -1
- package/build/tests/buildTestCache.js +2 -2
- package/build/tests/buildTestCache.js.map +1 -1
- package/package.json +3 -3
- package/src/__tests__/behavioral/{CreatingAConversationTopic.test.ts → conversations/CreatingAConversationTopic.test.ts} +3 -3
- package/src/__tests__/behavioral/{RegisteringConversationsOnBoot.test.ts → conversations/RegisteringConversationsOnBoot.test.ts} +1 -1
- package/src/__tests__/behavioral/{TestingAConversation.test.ts → conversations/TestingAConversation.test.ts} +2 -3
- package/src/__tests__/behavioral/events/KeepingListenersInSync.test.ts +2 -2
- package/src/__tests__/behavioral/{GettingCliVersion.test.ts → versions/GettingCliVersion.test.ts} +4 -4
- package/src/__tests__/behavioral/versions/ResolvingVersions.test.ts +146 -0
- package/src/__tests__/behavioral/views/CreatingASkillView.test.ts +26 -8
- package/src/features/AbstractAction.ts +7 -56
- package/src/features/VersionResolver.ts +121 -0
- package/src/features/view/actions/CreateAction.ts +4 -3
- package/src/features/view/writers/ViewWriter.ts +4 -3
- package/src/tests/buildTestCache.ts +2 -2
- package/build/__tests__/behavioral/CreatingAConversationTopic.test.js.map +0 -1
- package/build/__tests__/behavioral/GettingCliVersion.test.js.map +0 -1
- package/build/__tests__/behavioral/RegisteringConversationsOnBoot.test.js.map +0 -1
- package/build/__tests__/behavioral/TestingAConversation.test.js.map +0 -1
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const schema_1 = require("@sprucelabs/schema");
|
|
4
|
+
const spruce_skill_utils_1 = require("@sprucelabs/spruce-skill-utils");
|
|
5
|
+
class VersionResolver {
|
|
6
|
+
ui;
|
|
7
|
+
pkg;
|
|
8
|
+
constructor(ui, pkg) {
|
|
9
|
+
this.ui = ui;
|
|
10
|
+
this.pkg = pkg;
|
|
11
|
+
}
|
|
12
|
+
static Resolver(ui, pkg) {
|
|
13
|
+
(0, schema_1.assertOptions)({ ui, pkg }, ['ui', 'pkg']);
|
|
14
|
+
return new this(ui, pkg);
|
|
15
|
+
}
|
|
16
|
+
async resolveVersion(resolvedDestination, userSuppliedVersion) {
|
|
17
|
+
if (userSuppliedVersion) {
|
|
18
|
+
spruce_skill_utils_1.versionUtil.assertValidVersion(userSuppliedVersion);
|
|
19
|
+
}
|
|
20
|
+
let resolvedVersion = spruce_skill_utils_1.versionUtil.generateVersion(userSuppliedVersion ?? undefined).constValue;
|
|
21
|
+
if (!userSuppliedVersion) {
|
|
22
|
+
resolvedVersion =
|
|
23
|
+
await this.askForVersionIfTodaysVersionDoesNotExist(resolvedDestination, resolvedVersion);
|
|
24
|
+
}
|
|
25
|
+
const version = spruce_skill_utils_1.versionUtil.generateVersion(resolvedVersion).dirValue;
|
|
26
|
+
this.persistVersion(version);
|
|
27
|
+
return version;
|
|
28
|
+
}
|
|
29
|
+
persistVersion(version) {
|
|
30
|
+
this.pkg.set({
|
|
31
|
+
path: 'skill.version',
|
|
32
|
+
value: version,
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
async askForVersionIfTodaysVersionDoesNotExist(resolvedDestination, fallbackVersion) {
|
|
36
|
+
const versions = this.loadVersions(resolvedDestination);
|
|
37
|
+
const choices = this.buildChoices(versions);
|
|
38
|
+
if (versions.length > 0) {
|
|
39
|
+
return await this.ui.prompt({
|
|
40
|
+
type: 'select',
|
|
41
|
+
label: 'Version',
|
|
42
|
+
hint: 'Confirm which version you want to use?',
|
|
43
|
+
isRequired: true,
|
|
44
|
+
options: {
|
|
45
|
+
choices,
|
|
46
|
+
},
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
return fallbackVersion;
|
|
50
|
+
}
|
|
51
|
+
buildChoices(versions) {
|
|
52
|
+
const todaysVersion = spruce_skill_utils_1.versionUtil.generateVersion();
|
|
53
|
+
const alreadyHasToday = !!versions.find((version) => version.dirValue === todaysVersion.dirValue);
|
|
54
|
+
const choices = [];
|
|
55
|
+
if (!alreadyHasToday) {
|
|
56
|
+
choices.push({
|
|
57
|
+
label: 'New Version',
|
|
58
|
+
value: todaysVersion.dirValue,
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
choices.push(...versions
|
|
62
|
+
.sort((a, b) => {
|
|
63
|
+
return a.intValue > b.intValue ? -1 : 1;
|
|
64
|
+
})
|
|
65
|
+
.map((version) => ({
|
|
66
|
+
value: version.dirValue,
|
|
67
|
+
label: version.dirValue,
|
|
68
|
+
})));
|
|
69
|
+
return choices;
|
|
70
|
+
}
|
|
71
|
+
loadVersions(resolvedDestination) {
|
|
72
|
+
const versions = spruce_skill_utils_1.versionUtil.getAllVersions(resolvedDestination);
|
|
73
|
+
const persistedVersion = this.pkg.get('skill.version');
|
|
74
|
+
const todaysVersion = spruce_skill_utils_1.versionUtil.generateVersion().dirValue;
|
|
75
|
+
if (persistedVersion &&
|
|
76
|
+
todaysVersion !== persistedVersion &&
|
|
77
|
+
!versions.find((v) => v.dirValue === persistedVersion)) {
|
|
78
|
+
versions.push({
|
|
79
|
+
intValue: spruce_skill_utils_1.versionUtil.generateVersion(persistedVersion).intValue,
|
|
80
|
+
dirValue: persistedVersion,
|
|
81
|
+
constValue: persistedVersion,
|
|
82
|
+
});
|
|
83
|
+
}
|
|
84
|
+
return versions;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
exports.default = VersionResolver;
|
|
88
|
+
//# sourceMappingURL=VersionResolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"VersionResolver.js","sourceRoot":"","sources":["../../src/features/VersionResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,9 +17,10 @@ class CreateAction extends AbstractAction_1.default {
|
|
|
17
17
|
async execute(options) {
|
|
18
18
|
let { viewType, isRoot, nameReadable, namePascal, viewModel } = this.validateAndNormalizeOptions(options);
|
|
19
19
|
const writer = this.Writer('view');
|
|
20
|
-
|
|
20
|
+
const shouldAskAboutRootSvc = viewType === 'skillView' &&
|
|
21
21
|
!isRoot &&
|
|
22
|
-
!writer.doesRootControllerExist(this.cwd))
|
|
22
|
+
!(await writer.doesRootControllerExist(this.cwd));
|
|
23
|
+
if (shouldAskAboutRootSvc) {
|
|
23
24
|
isRoot = await this.ui.confirm('Do you want to create a root view controller?');
|
|
24
25
|
}
|
|
25
26
|
if (!isRoot && !nameReadable) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateAction.js","sourceRoot":"","sources":["../../../../src/features/view/actions/CreateAction.ts"],"names":[],"mappings":";;;;;AAAA,+CAA8D;AAC9D,uEAA0D;AAC1D,sFAA6D;AAC7D,uHAA6F;AAC7F,uFAA0D;AAC1D,mFAAsD;AACtD,0EAAiD;AAGjD,MAAqB,YAAa,SAAQ,wBAA6B;IAC5D,aAAa,GAAkB,aAAa,CAAA;IAC5C,cAAc,GAAG,CAAC,aAAa,CAAC,CAAA;IAChC,iBAAiB,GAAG,yCAAyC,CAAA;IAE7D,KAAK,CAAC,OAAO,CAChB,OAAoC;QAEpC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,GACzD,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAA;QAE7C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAElC,
|
|
1
|
+
{"version":3,"file":"CreateAction.js","sourceRoot":"","sources":["../../../../src/features/view/actions/CreateAction.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ export default class ViewWriter extends AbstractWriter {
|
|
|
14
14
|
nameKebab: string;
|
|
15
15
|
}): Promise<import("../../../writers/AbstractWriter").WriteResults>;
|
|
16
16
|
private writeController;
|
|
17
|
-
doesRootControllerExist(cwd: string): boolean
|
|
17
|
+
doesRootControllerExist(cwd: string): Promise<boolean>;
|
|
18
18
|
writeViewControllerPlugin(options: {
|
|
19
19
|
cwd: string;
|
|
20
20
|
nameCamel: string;
|
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const globby_1 = __importDefault(require("@sprucelabs/globby"));
|
|
6
7
|
const spruce_skill_utils_1 = require("@sprucelabs/spruce-skill-utils");
|
|
7
8
|
const SpruceError_1 = __importDefault(require("../../../errors/SpruceError"));
|
|
8
9
|
const AbstractWriter_1 = __importDefault(require("../../../writers/AbstractWriter"));
|
|
@@ -57,9 +58,9 @@ class ViewWriter extends AbstractWriter_1.default {
|
|
|
57
58
|
const results = this.writeFileIfChangedMixinResults(path, contents, 'Your new view controller!');
|
|
58
59
|
return results;
|
|
59
60
|
}
|
|
60
|
-
doesRootControllerExist(cwd) {
|
|
61
|
-
const
|
|
62
|
-
return
|
|
61
|
+
async doesRootControllerExist(cwd) {
|
|
62
|
+
const matches = await (0, globby_1.default)('**/Root.svc.ts', { cwd });
|
|
63
|
+
return matches.length > 0;
|
|
63
64
|
}
|
|
64
65
|
async writeViewControllerPlugin(options) {
|
|
65
66
|
const { nameCamel, namePascal, cwd } = options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewWriter.js","sourceRoot":"","sources":["../../../../src/features/view/writers/ViewWriter.ts"],"names":[],"mappings":";;;;;AAAA,uEAAyD;AAMzD,8EAAqD;AACrD,qFAA4D;AAE5D,MAAqB,UAAW,SAAQ,wBAAc;IAC3C,wBAAwB,CAC3B,GAAW,EACX,OAGC;QAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,uBAAuB,CACzC,GAAG,EACH,WAAW,EACX,OAAO,CAAC,UAAU,CACrB,CAAA;QAED,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAA;IAC5E,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,GAAW,EAAE,OAAqB;QAClE,IAAI,EAAE,eAAe,EAAE,gBAAgB,EAAE,eAAe,EAAE,GAAG,IAAI,EAAE,GAC/D,OAAO,CAAA;QAEX,MAAM,cAAc,GAAG,6BAAQ,CAAC,qBAAqB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QACnE,MAAM,WAAW,GAAG,6BAAQ,CAAC,WAAW,CAAC,cAAc,EAAE,UAAU,CAAC,CAAA;QAEpE,eAAe,GAAG,IAAI,CAAC,qCAAqC,CACxD,eAAe,EACf,cAAc,CACjB,CAAA;QAED,gBAAgB,GAAG,IAAI,CAAC,qCAAqC,CACzD,gBAAgB,EAChB,cAAc,CACjB,CAAA;QAED,eAAe,GAAG,IAAI,CAAC,qCAAqC,CACxD,eAAe,EACf,cAAc,CACjB,CAAA;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;YAClC,eAAe;YACf,gBAAgB;YAChB,eAAe;YACf,GAAG,IAAI;SACV,CAAC,CAAA;QAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,8BAA8B,CACrD,WAAW,EACX,QAAQ,EACR,+CAA+C,CAClD,CAAA;QAED,OAAO,OAAO,CAAA;IAClB,CAAC;IAEO,qCAAqC,CAE3C,eAAoB,EAAE,cAAsB;QAC1C,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/B,GAAG,CAAC;YACJ,IAAI,EAAE,6BAAQ;iBACT,mBAAmB,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC;iBAC3C,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;SAC1B,CAAC,CAAC,CAAA;IACP,CAAC;IAEM,mBAAmB,CACtB,GAAW,EACX,OAKC;QAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,uBAAuB,CACzC,GAAG,EACH,MAAM,EACN,OAAO,CAAC,UAAU,CACrB,CAAA;QAED,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IAC9C,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,IAAY,EAAE,OAAY;QACpD,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;QAE9D,IAAI,6BAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,qBAAW,CAAC;gBAClB,IAAI,EAAE,mBAAmB;gBACzB,IAAI,EAAE,UAAU;aACnB,CAAC,CAAA;QACN,CAAC;QAED,MAAM,QAAQ,GACV,QAAQ,KAAK,WAAW;YACpB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;YAC/D,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;gBAC1B,UAAU;gBACV,SAAS;gBACT,SAAS;aACZ,CAAC,CAAA;QAEZ,MAAM,OAAO,GAAG,IAAI,CAAC,8BAA8B,CAC/C,IAAI,EACJ,QAAQ,EACR,2BAA2B,CAC9B,CAAA;QAED,OAAO,OAAO,CAAA;IAClB,CAAC;IAEM,uBAAuB,CAAC,GAAW;
|
|
1
|
+
{"version":3,"file":"ViewWriter.js","sourceRoot":"","sources":["../../../../src/features/view/writers/ViewWriter.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ let didMessagesChange = true;
|
|
|
35
35
|
async function run() {
|
|
36
36
|
term.clear();
|
|
37
37
|
if (process.env.WILL_BUILD_CACHE_SCRIPT) {
|
|
38
|
-
term.renderLine('Running
|
|
38
|
+
term.renderLine('Running will-build cache script');
|
|
39
39
|
if (process.env.CLEAN_CACHE_SCRIPT) {
|
|
40
40
|
try {
|
|
41
41
|
(0, child_process_1.execSync)(process.env.CLEAN_CACHE_SCRIPT);
|
|
@@ -172,7 +172,7 @@ function dropInS(remaining) {
|
|
|
172
172
|
void run()
|
|
173
173
|
.then(() => {
|
|
174
174
|
if (process.env.DID_BUILD_CACHE_SCRIPT) {
|
|
175
|
-
term.renderLine('Running
|
|
175
|
+
term.renderLine('Running did-build cache script');
|
|
176
176
|
(0, child_process_1.execSync)(process.env.DID_BUILD_CACHE_SCRIPT);
|
|
177
177
|
}
|
|
178
178
|
if (progressInterval) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildTestCache.js","sourceRoot":"","sources":["../../src/tests/buildTestCache.ts"],"names":[],"mappings":";;;;;;AACA,iDAAwC;AACxC,uEAAyD;AACzD,wFAA+D;AAC/D,8EAAqD;AACrD,gFAAuD;AACvD,mFAAsD;AACtD,8EAAqE;AACrE,qFAAwD;AACxD,+EAAsD;AACtD,+EAAsD;AACtD,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAA;AAE1B,MAAM,mBAAmB,GAAG,6BAAQ,CAAC,QAAQ,CACzC,6BAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAC9D,CAAA;AAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;AACnD,MAAM,EAAE,cAAc,EAAE,GAAG,WAAW,CAAA;AACtC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;AAE5C,IAAI,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAA;AAC/B,MAAM,IAAI,GAAG,IAAI,2BAAiB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;AACnD,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAA;AAClC,MAAM,iBAAiB,GACnB,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,GAAG;IACpC,CAAC,CAAC,SAAS;IACX,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAA;AAC1C,MAAM,WAAW,GAAG,iBAAiB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAEtD,CAAA;AAEf,MAAM,qBAAqB,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAC7C,CAAC,CAAC,EAAE,EAAE,CACF,CAAC,KAAK,8BAA8B,IAAI,CAAC,KAAK,yBAAyB,CAC9E,CAAA;AACD,MAAM,eAAe,GAAG,QAAQ,CAC5B,OAAO,CAAC,GAAG,CAAC,8BAA8B,IAAI,IAAI,EAClD,EAAE,CACL,CAAA;AACD,IAAI,iBAAiB,GAAG,CAAC,CAAA;AACzB,IAAI,gBAAqB,CAAA;AACzB,MAAM,gBAAgB,GAAG,2BAAiB,CAAC,gBAAgB,EAAE,CAAA;AAE7D,IAAI,iBAAiB,GAAG,IAAI,CAAA;AAE5B,KAAK,UAAU,GAAG;IACd,IAAI,CAAC,KAAK,EAAE,CAAA;IAEZ,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,CAAC;QACtC,IAAI,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"buildTestCache.js","sourceRoot":"","sources":["../../src/tests/buildTestCache.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
]
|
|
19
19
|
},
|
|
20
20
|
"license": "MIT",
|
|
21
|
-
"version": "
|
|
21
|
+
"version": "22.0.0",
|
|
22
22
|
"bin": {
|
|
23
23
|
"spruce": "./build/index.js"
|
|
24
24
|
},
|
|
@@ -85,7 +85,7 @@
|
|
|
85
85
|
"@sprucelabs/spruce-core-schemas": "^40.1.302",
|
|
86
86
|
"@sprucelabs/spruce-event-utils": "^40.1.79",
|
|
87
87
|
"@sprucelabs/spruce-skill-utils": "^31.0.376",
|
|
88
|
-
"@sprucelabs/spruce-templates": "^
|
|
88
|
+
"@sprucelabs/spruce-templates": "^22.0.0",
|
|
89
89
|
"@typescript-eslint/eslint-plugin": "^7.7.1",
|
|
90
90
|
"@typescript-eslint/parser": "^7.7.1",
|
|
91
91
|
"cfonts": "^3.3.0",
|
|
@@ -591,5 +591,5 @@
|
|
|
591
591
|
"open"
|
|
592
592
|
]
|
|
593
593
|
},
|
|
594
|
-
"gitHead": "
|
|
594
|
+
"gitHead": "01076907ec0c10178d840ca1355a4fb55375f9fa"
|
|
595
595
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import '@sprucelabs/spruce-conversation-plugin'
|
|
2
2
|
import { test, assert } from '@sprucelabs/test-utils'
|
|
3
|
-
import AbstractCliTest from '
|
|
4
|
-
import testUtil from '
|
|
5
|
-
import { CliInterface } from '
|
|
3
|
+
import AbstractCliTest from '../../../tests/AbstractCliTest'
|
|
4
|
+
import testUtil from '../../../tests/utilities/test.utility'
|
|
5
|
+
import { CliInterface } from '../../../types/cli.types'
|
|
6
6
|
|
|
7
7
|
export default class CreatingAConversationTopicTest extends AbstractCliTest {
|
|
8
8
|
@test()
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { test, assert } from '@sprucelabs/test-utils'
|
|
2
|
-
import AbstractEventTest from '
|
|
2
|
+
import AbstractEventTest from '../../../tests/AbstractEventTest'
|
|
3
3
|
|
|
4
4
|
export default class RegisteringConversationsOnBootTest extends AbstractEventTest {
|
|
5
5
|
@test()
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { diskUtil } from '@sprucelabs/spruce-skill-utils'
|
|
2
2
|
import { test, assert } from '@sprucelabs/test-utils'
|
|
3
3
|
import findProcess from 'find-process'
|
|
4
|
-
import
|
|
5
|
-
import
|
|
6
|
-
import testUtil from '../../tests/utilities/test.utility'
|
|
4
|
+
import AbstractCliTest from '../../../tests/AbstractCliTest'
|
|
5
|
+
import testUtil from '../../../tests/utilities/test.utility'
|
|
7
6
|
|
|
8
7
|
export default class TestingAConversationTest extends AbstractCliTest {
|
|
9
8
|
@test()
|
|
@@ -11,10 +11,10 @@ export default class KeepingListenersInSyncTest extends AbstractEventTest {
|
|
|
11
11
|
}
|
|
12
12
|
|
|
13
13
|
@test()
|
|
14
|
-
protected static async
|
|
14
|
+
protected static async deletingAListenerAndSyncingUpdatesListener() {
|
|
15
15
|
await this.FeatureFixture().installCachedFeatures('events')
|
|
16
|
-
|
|
17
16
|
await this.createBootListener('did-boot')
|
|
17
|
+
|
|
18
18
|
const results = await this.createBootListener('will-boot')
|
|
19
19
|
|
|
20
20
|
this.deleteLastFile(results)
|
package/src/__tests__/behavioral/{GettingCliVersion.test.ts → versions/GettingCliVersion.test.ts}
RENAMED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { test, assert } from '@sprucelabs/test-utils'
|
|
2
|
-
import AbstractCliTest from '
|
|
2
|
+
import AbstractCliTest from '../../../tests/AbstractCliTest'
|
|
3
3
|
|
|
4
4
|
export default class GettingCliVersionTest extends AbstractCliTest {
|
|
5
5
|
protected static async beforeEach() {
|
|
6
6
|
await super.beforeEach()
|
|
7
|
-
this.cwd = this.resolvePath(__dirname, '..', '..', '..')
|
|
7
|
+
this.cwd = this.resolvePath(__dirname, '..', '..', '..', '..')
|
|
8
8
|
}
|
|
9
9
|
|
|
10
10
|
@test()
|
|
@@ -12,7 +12,7 @@ export default class GettingCliVersionTest extends AbstractCliTest {
|
|
|
12
12
|
const results = await this.Service('command').execute(
|
|
13
13
|
'node ./build/index.js -v'
|
|
14
14
|
)
|
|
15
|
-
const needle = require('
|
|
15
|
+
const needle = require('../../../../package.json').version
|
|
16
16
|
|
|
17
17
|
assert.doesInclude(results.stdout, needle)
|
|
18
18
|
}
|
|
@@ -22,7 +22,7 @@ export default class GettingCliVersionTest extends AbstractCliTest {
|
|
|
22
22
|
const results = await this.Service('command').execute(
|
|
23
23
|
'node ./build/index.js --version'
|
|
24
24
|
)
|
|
25
|
-
const needle = require('
|
|
25
|
+
const needle = require('../../../../package.json').version
|
|
26
26
|
|
|
27
27
|
assert.doesInclude(results.stdout, needle)
|
|
28
28
|
}
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
import { SelectChoice } from '@sprucelabs/spruce-core-schemas'
|
|
2
|
+
import {
|
|
3
|
+
diskUtil,
|
|
4
|
+
PkgService,
|
|
5
|
+
versionUtil,
|
|
6
|
+
} from '@sprucelabs/spruce-skill-utils'
|
|
7
|
+
import { test, assert, errorAssert } from '@sprucelabs/test-utils'
|
|
8
|
+
import VersionResolver from '../../../features/VersionResolver'
|
|
9
|
+
import AbstractSkillTest from '../../../tests/AbstractSkillTest'
|
|
10
|
+
|
|
11
|
+
export default class ResolvingVersionsTest extends AbstractSkillTest {
|
|
12
|
+
protected static skillCacheKey = 'skills'
|
|
13
|
+
private static pkg: PkgService
|
|
14
|
+
private static versions: VersionResolver
|
|
15
|
+
|
|
16
|
+
protected static async beforeEach(): Promise<void> {
|
|
17
|
+
await super.beforeEach()
|
|
18
|
+
this.pkg = this.Service('pkg')
|
|
19
|
+
this.versions = VersionResolver.Resolver(this.ui, this.pkg)
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
protected static async afterEach(): Promise<void> {
|
|
23
|
+
this.ui.reset()
|
|
24
|
+
await super.afterEach()
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
@test()
|
|
28
|
+
protected static async throwsWhenMissingRequired() {
|
|
29
|
+
//@ts-ignore
|
|
30
|
+
const err = assert.doesThrow(() => VersionResolver.Resolver())
|
|
31
|
+
errorAssert.assertError(err, 'MISSING_PARAMETERS', {
|
|
32
|
+
parameters: ['ui', 'pkg'],
|
|
33
|
+
})
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
@test()
|
|
37
|
+
protected static async addsVersionToThePackageJson() {
|
|
38
|
+
const version = await this.resolveVersion()
|
|
39
|
+
this.assertSavedVersionEquals(version)
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
@test()
|
|
43
|
+
protected static async addsVersionToPackageJsonWhenChoosingDifferentVersion() {
|
|
44
|
+
const version = await this.resolveVersion('v2023_09_16')
|
|
45
|
+
this.assertSavedVersionEquals(version)
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
@test()
|
|
49
|
+
protected static async addsVersionFromPackageJsonWhenChoosingDifferentVersion() {
|
|
50
|
+
debugger
|
|
51
|
+
await this.resolveAndAssertChoices([
|
|
52
|
+
this.newVersionChoice,
|
|
53
|
+
this.buildVersionChoice('v2023_09_16'),
|
|
54
|
+
])
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
@test()
|
|
58
|
+
protected static async doesNotAddVersionToChoicesIfDirMatchesVersion() {
|
|
59
|
+
debugger
|
|
60
|
+
this.createVersionDir('v2023_09_16')
|
|
61
|
+
debugger
|
|
62
|
+
await this.resolveAndAssertChoices([
|
|
63
|
+
this.newVersionChoice,
|
|
64
|
+
this.buildVersionChoice('v2023_09_16'),
|
|
65
|
+
])
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
@test()
|
|
69
|
+
protected static async addsVersionChoiceIfVersionInPackageJsonIsDifferent() {
|
|
70
|
+
this.pkg.set({
|
|
71
|
+
path: 'skill.version',
|
|
72
|
+
value: 'v2200_01_01',
|
|
73
|
+
})
|
|
74
|
+
|
|
75
|
+
await this.resolveAndAssertChoices([
|
|
76
|
+
this.newVersionChoice,
|
|
77
|
+
this.buildVersionChoice('v2200_01_01'),
|
|
78
|
+
this.buildVersionChoice('v2023_09_16'),
|
|
79
|
+
])
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
@test()
|
|
83
|
+
protected static async doesNotAddVersionChoiceIfSecondDirNameMatches() {
|
|
84
|
+
this.createVersionDir('v2200_01_01')
|
|
85
|
+
|
|
86
|
+
await this.resolveAndAssertChoices([
|
|
87
|
+
this.newVersionChoice,
|
|
88
|
+
this.buildVersionChoice('v2200_01_01'),
|
|
89
|
+
this.buildVersionChoice('v2023_09_16'),
|
|
90
|
+
])
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
private static async resolveAndAssertChoices(expected: SelectChoice[]) {
|
|
94
|
+
await this.resolveAndWaitForInput()
|
|
95
|
+
this.assertChoices(expected)
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
private static assertChoices(expected: SelectChoice[]) {
|
|
99
|
+
assert.isEqualDeep(this.choices, expected)
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
private static buildVersionChoice(version: string): SelectChoice {
|
|
103
|
+
return {
|
|
104
|
+
label: version,
|
|
105
|
+
value: version,
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
private static createVersionDir(version: string) {
|
|
110
|
+
const path = this.resolvePath('src', version)
|
|
111
|
+
diskUtil.createDir(path)
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
private static get newVersionChoice(): SelectChoice {
|
|
115
|
+
return {
|
|
116
|
+
label: 'New Version',
|
|
117
|
+
value: versionUtil.generateVersion().dirValue,
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
private static async resolveAndWaitForInput() {
|
|
122
|
+
void this.resolveVersion()
|
|
123
|
+
await this.ui.waitForInput()
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
private static get choices() {
|
|
127
|
+
const { options } = this.ui.getLastInvocation()
|
|
128
|
+
const choices = options.options.choices
|
|
129
|
+
return choices
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
private static async resolveVersion(userSuppliedVersion?: string | null) {
|
|
133
|
+
return await this.versions.resolveVersion(
|
|
134
|
+
this.resolvePath('src'),
|
|
135
|
+
userSuppliedVersion
|
|
136
|
+
)
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
private static assertSavedVersionEquals(version: string) {
|
|
140
|
+
assert.isEqual(
|
|
141
|
+
this.pkg.get(['skill', 'version']),
|
|
142
|
+
version,
|
|
143
|
+
`The version in the package.json does not match the resolved version`
|
|
144
|
+
)
|
|
145
|
+
}
|
|
146
|
+
}
|
|
@@ -103,16 +103,21 @@ export default class CreatingASkillViewTest extends AbstractSkillTest {
|
|
|
103
103
|
}
|
|
104
104
|
|
|
105
105
|
@test()
|
|
106
|
-
protected static async
|
|
107
|
-
const
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
106
|
+
protected static async doesNotAskForRootAgainEvenIfRootIsMoved() {
|
|
107
|
+
const destinationDir = this.resolvePath('src', 'root')
|
|
108
|
+
diskUtil.createDir(destinationDir)
|
|
109
|
+
diskUtil.moveFile(
|
|
110
|
+
this.rootSvc,
|
|
111
|
+
this.resolvePath(destinationDir, 'Root.svc.ts')
|
|
112
|
+
)
|
|
112
113
|
|
|
113
|
-
|
|
114
|
+
await this.createSkillViewAndWaitForPrompt()
|
|
115
|
+
this.ui.reset()
|
|
116
|
+
}
|
|
114
117
|
|
|
115
|
-
|
|
118
|
+
@test()
|
|
119
|
+
protected static async asksForNamesIfCreatingSkillViewNotRoot() {
|
|
120
|
+
const { promise } = await this.createSkillViewAndWaitForPrompt()
|
|
116
121
|
|
|
117
122
|
await this.ui.sendInput('Dashboard')
|
|
118
123
|
await this.ui.sendInput('\n')
|
|
@@ -234,6 +239,19 @@ export const svcId: SkillViewControllerId = 'testing-views.root'`,
|
|
|
234
239
|
)
|
|
235
240
|
}
|
|
236
241
|
|
|
242
|
+
private static async createSkillViewAndWaitForPrompt() {
|
|
243
|
+
const promise = this.action.execute({
|
|
244
|
+
viewType: 'skillView',
|
|
245
|
+
})
|
|
246
|
+
|
|
247
|
+
await this.waitForInput()
|
|
248
|
+
|
|
249
|
+
let last = this.ui.getLastInvocation()
|
|
250
|
+
|
|
251
|
+
assert.isEqual(last.command, 'prompt')
|
|
252
|
+
return { promise }
|
|
253
|
+
}
|
|
254
|
+
|
|
237
255
|
private static buildTestfile(options: {
|
|
238
256
|
code: string
|
|
239
257
|
idInterfaceName: 'SkillViewControllerId' | 'ViewControllerId'
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { Schema, SchemaValues, SchemaPartialValues } from '@sprucelabs/schema'
|
|
2
|
-
import { versionUtil } from '@sprucelabs/spruce-skill-utils'
|
|
3
2
|
import { Templates } from '@sprucelabs/spruce-templates'
|
|
4
3
|
import { GlobalEmitter } from '../GlobalEmitter'
|
|
5
4
|
import ServiceFactory, {
|
|
@@ -30,6 +29,7 @@ import {
|
|
|
30
29
|
FeatureCode,
|
|
31
30
|
} from './features.types'
|
|
32
31
|
import validateAndNormalizer from './validateAndNormalize.utility'
|
|
32
|
+
import VersionResolver from './VersionResolver'
|
|
33
33
|
|
|
34
34
|
export default abstract class AbstractAction<S extends Schema = Schema>
|
|
35
35
|
implements FeatureAction<S>, ServiceProvider
|
|
@@ -115,64 +115,15 @@ export default abstract class AbstractAction<S extends Schema = Schema>
|
|
|
115
115
|
userSuppliedVersion: string | null | undefined,
|
|
116
116
|
resolvedDestination: string
|
|
117
117
|
) {
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
if (!userSuppliedVersion) {
|
|
123
|
-
resolvedVersion =
|
|
124
|
-
await this.askForVersionIfTodaysVersionDoesNotExist(
|
|
125
|
-
resolvedDestination,
|
|
126
|
-
resolvedVersion
|
|
127
|
-
)
|
|
128
|
-
}
|
|
129
|
-
versionUtil.assertValidVersion(resolvedVersion)
|
|
130
|
-
|
|
131
|
-
return versionUtil.generateVersion(resolvedVersion).dirValue
|
|
132
|
-
}
|
|
133
|
-
|
|
134
|
-
private async askForVersionIfTodaysVersionDoesNotExist(
|
|
135
|
-
resolvedDestination: string,
|
|
136
|
-
fallbackVersion: string
|
|
137
|
-
) {
|
|
138
|
-
const versions = versionUtil.getAllVersions(resolvedDestination)
|
|
139
|
-
const todaysVersion = versionUtil.generateVersion()
|
|
140
|
-
|
|
141
|
-
let version = fallbackVersion
|
|
142
|
-
const alreadyHasToday = !!versions.find(
|
|
143
|
-
(version) => version.dirValue === todaysVersion.dirValue
|
|
118
|
+
const versions = VersionResolver.Resolver(
|
|
119
|
+
this.ui,
|
|
120
|
+
this.serviceFactory.Service(this.cwd, 'pkg')
|
|
144
121
|
)
|
|
145
|
-
const
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
choices.push({
|
|
149
|
-
label: 'New Version',
|
|
150
|
-
value: todaysVersion.dirValue,
|
|
151
|
-
})
|
|
152
|
-
}
|
|
153
|
-
|
|
154
|
-
choices.push(
|
|
155
|
-
...versions
|
|
156
|
-
.sort((a, b) => {
|
|
157
|
-
return a.intValue > b.intValue ? -1 : 1
|
|
158
|
-
})
|
|
159
|
-
.map((version) => ({
|
|
160
|
-
value: version.dirValue,
|
|
161
|
-
label: version.dirValue,
|
|
162
|
-
}))
|
|
122
|
+
const version = await versions.resolveVersion(
|
|
123
|
+
resolvedDestination,
|
|
124
|
+
userSuppliedVersion
|
|
163
125
|
)
|
|
164
126
|
|
|
165
|
-
if (versions.length > 0) {
|
|
166
|
-
version = await this.ui.prompt({
|
|
167
|
-
type: 'select',
|
|
168
|
-
label: 'Version',
|
|
169
|
-
hint: 'Confirm which version you want to use?',
|
|
170
|
-
isRequired: true,
|
|
171
|
-
options: {
|
|
172
|
-
choices,
|
|
173
|
-
},
|
|
174
|
-
})
|
|
175
|
-
}
|
|
176
127
|
return version
|
|
177
128
|
}
|
|
178
129
|
|