@sprucelabs/spruce-cli 21.0.3 → 21.0.5
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/events/UsingBuildersFromRemoteContracts.test.d.ts +5 -0
- package/build/__tests__/behavioral/events/UsingBuildersFromRemoteContracts.test.js +52 -0
- package/build/__tests__/behavioral/events/UsingBuildersFromRemoteContracts.test.js.map +1 -0
- package/build/features/event/EventFeature.js +1 -1
- package/build/features/event/EventFeature.js.map +1 -1
- package/build/features/event/actions/SyncAction.js +11 -0
- package/build/features/event/actions/SyncAction.js.map +1 -1
- package/build/features/event/builders/EventContractBuilder.d.ts +6 -4
- package/build/features/event/builders/EventContractBuilder.js +10 -4
- package/build/features/event/builders/EventContractBuilder.js.map +1 -1
- package/build/features/event/services/EventCacheService.d.ts +1 -0
- package/build/features/event/services/EventCacheService.js.map +1 -1
- package/build/features/event/stores/EventStore.d.ts +1 -0
- package/build/features/event/stores/EventStore.js +7 -1
- package/build/features/event/stores/EventStore.js.map +1 -1
- package/build/features/node/NodeFeature.d.ts +0 -1
- package/build/features/skill/SkillFeature.d.ts +0 -1
- package/build/features/universalDevDependencies.js +0 -1
- package/build/features/universalDevDependencies.js.map +1 -1
- package/build/features/universalScripts.d.ts +0 -1
- package/build/features/universalScripts.js +0 -1
- package/build/features/universalScripts.js.map +1 -1
- package/build/services/LintService.d.ts +1 -0
- package/build/services/LintService.js +4 -1
- package/build/services/LintService.js.map +1 -1
- package/build/writers/AbstractWriter.js +3 -1
- package/build/writers/AbstractWriter.js.map +1 -1
- package/eslint.config.mjs +1 -0
- package/package.json +35 -32
- package/src/__tests__/behavioral/events/UsingBuildersFromRemoteContracts.test.ts +43 -0
- package/src/features/event/EventFeature.ts +2 -1
- package/src/features/event/actions/SyncAction.ts +14 -0
- package/src/features/event/builders/EventContractBuilder.ts +20 -8
- package/src/features/event/services/EventCacheService.ts +1 -0
- package/src/features/event/stores/EventStore.ts +14 -1
- package/src/features/universalDevDependencies.ts +0 -1
- package/src/features/universalScripts.ts +0 -2
- package/src/services/LintService.ts +7 -3
- package/src/writers/AbstractWriter.ts +2 -1
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
|
+
## [21.0.5](https://github.com/sprucelabsai-community/spruce-cli-workspace/compare/v21.0.4...v21.0.5) (2024-04-24)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @sprucelabs/spruce-cli
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [21.0.4](https://github.com/sprucelabsai-community/spruce-cli-workspace/compare/v21.0.3...v21.0.4) (2024-04-24)
|
|
15
|
+
|
|
16
|
+
**Note:** Version bump only for package @sprucelabs/spruce-cli
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
6
22
|
## [21.0.3](https://github.com/sprucelabsai-community/spruce-cli-workspace/compare/v21.0.2...v21.0.3) (2024-04-23)
|
|
7
23
|
|
|
8
24
|
**Note:** Version bump only for package @sprucelabs/spruce-cli
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import AbstractSkillTest from '../../../tests/AbstractSkillTest';
|
|
2
|
+
export default class UsingBuildersFromRemoteContractsTest extends AbstractSkillTest {
|
|
3
|
+
protected static skillCacheKey: string;
|
|
4
|
+
protected static canCreateBuilderThatReferencesRemoteSkillsSchema(): Promise<void>;
|
|
5
|
+
}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
const spruce_skill_utils_1 = require("@sprucelabs/spruce-skill-utils");
|
|
13
|
+
const test_utils_1 = require("@sprucelabs/test-utils");
|
|
14
|
+
const AbstractSkillTest_1 = __importDefault(require("../../../tests/AbstractSkillTest"));
|
|
15
|
+
class UsingBuildersFromRemoteContractsTest extends AbstractSkillTest_1.default {
|
|
16
|
+
static skillCacheKey = 'views';
|
|
17
|
+
static async canCreateBuilderThatReferencesRemoteSkillsSchema() {
|
|
18
|
+
const path = "'#spruce/schemas/heartwood/v2021_02_11/theme.schema'";
|
|
19
|
+
const builderContents = `import { buildSchema } from '@sprucelabs/schema'
|
|
20
|
+
// eslint-disable-next-line spruce/prohibit-import-of-schema-in-builders
|
|
21
|
+
import themeSchema from ${path}
|
|
22
|
+
|
|
23
|
+
export default buildSchema({
|
|
24
|
+
id: 'theme',
|
|
25
|
+
name: 'Theme',
|
|
26
|
+
fields: {
|
|
27
|
+
...themeSchema.fields,
|
|
28
|
+
fieldName1: {
|
|
29
|
+
type: 'text',
|
|
30
|
+
label: 'First Field',
|
|
31
|
+
isRequired: true,
|
|
32
|
+
},
|
|
33
|
+
fieldName2: {
|
|
34
|
+
type: 'number',
|
|
35
|
+
label: 'Second Field',
|
|
36
|
+
isRequired: true,
|
|
37
|
+
hint: 'A hint',
|
|
38
|
+
},
|
|
39
|
+
},
|
|
40
|
+
})
|
|
41
|
+
`;
|
|
42
|
+
const destination = this.resolvePath('src/schemas/v2024_04_24/theme.builder.ts');
|
|
43
|
+
spruce_skill_utils_1.diskUtil.writeFile(destination, builderContents);
|
|
44
|
+
const results = await this.Action('event', 'sync').execute({});
|
|
45
|
+
test_utils_1.assert.isFalsy(results.errors);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
exports.default = UsingBuildersFromRemoteContractsTest;
|
|
49
|
+
__decorate([
|
|
50
|
+
(0, test_utils_1.test)()
|
|
51
|
+
], UsingBuildersFromRemoteContractsTest, "canCreateBuilderThatReferencesRemoteSkillsSchema", null);
|
|
52
|
+
//# sourceMappingURL=UsingBuildersFromRemoteContracts.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UsingBuildersFromRemoteContracts.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/events/UsingBuildersFromRemoteContracts.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,uEAAyD;AACzD,uDAAqD;AACrD,yFAAgE;AAEhE,MAAqB,oCAAqC,SAAQ,2BAAiB;IACrE,MAAM,CAAC,aAAa,GAAG,OAAO,CAAA;IAGjB,AAAb,MAAM,CAAC,KAAK,CAAC,gDAAgD;QACnE,MAAM,IAAI,GAAG,sDAAsD,CAAA;QACnE,MAAM,eAAe,GAAG;;0BAEN,IAAI;;;;;;;;;;;;;;;;;;;;CAoB7B,CAAA;QAEO,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAChC,0CAA0C,CAC7C,CAAA;QAED,6BAAQ,CAAC,SAAS,CAAC,WAAW,EAAE,eAAe,CAAC,CAAA;QAChD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAC9D,mBAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAClC,CAAC;;AArCL,uDAsCC;AAlC0B;IADtB,IAAA,iBAAI,GAAE;kGAkCN"}
|
|
@@ -126,7 +126,7 @@ class EventFeature extends AbstractFeature_1.default {
|
|
|
126
126
|
const lastSync = this.Service('eventCache').getLastSyncOptions();
|
|
127
127
|
if (lastSync && isInstalled) {
|
|
128
128
|
const writer = this.getEventContractBuilder();
|
|
129
|
-
const uniqueSchemas = await writer.fetchContractsAndGenerateUniqueSchemas(payload.schemas ?? [], lastSync.shouldSyncOnlyCoreEvents);
|
|
129
|
+
const uniqueSchemas = await writer.fetchContractsAndGenerateUniqueSchemas(payload.schemas ?? [], lastSync.shouldSyncOnlyCoreEvents, lastSync.shouldOnlySyncRemoteEvents);
|
|
130
130
|
return {
|
|
131
131
|
schemas: uniqueSchemas.schemas ?? [],
|
|
132
132
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventFeature.js","sourceRoot":"","sources":["../../../src/features/event/EventFeature.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"EventFeature.js","sourceRoot":"","sources":["../../../src/features/event/EventFeature.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,17 @@ class SyncAction extends AbstractAction_1.default {
|
|
|
12
12
|
invocationMessage = 'Syncing event contracts... 🜒';
|
|
13
13
|
async execute(options) {
|
|
14
14
|
const builder = this.ContractBuilder();
|
|
15
|
+
await builder.fetchAndWriteContracts({
|
|
16
|
+
...options,
|
|
17
|
+
shouldOnlySyncRemoteEvents: true,
|
|
18
|
+
});
|
|
19
|
+
this.Service('eventCache').setLastSyncCache({
|
|
20
|
+
...options,
|
|
21
|
+
shouldOnlySyncRemoteEvents: true,
|
|
22
|
+
});
|
|
23
|
+
await this.Action('schema', 'sync').execute({
|
|
24
|
+
shouldFetchLocalSchemas: false,
|
|
25
|
+
});
|
|
15
26
|
const results = await builder.fetchAndWriteContracts(options);
|
|
16
27
|
if (results.errors) {
|
|
17
28
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SyncAction.js","sourceRoot":"","sources":["../../../../src/features/event/actions/SyncAction.ts"],"names":[],"mappings":";;;;;AACA,4HAAiG;AACjG,uFAA0D;AAC1D,0EAAiD;AAOjD,MAAqB,UAAW,SAAQ,wBAA6B;IAC1D,cAAc,GAAG,CAAC,aAAa,CAAC,CAAA;IAChC,aAAa,GAAkB,iCAAqB,CAAA;IACpD,iBAAiB,GAAG,+BAA+B,CAAA;IAEnD,KAAK,CAAC,OAAO,CAAC,OAAgB;QACjC,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,EAAE,CAAA;QAEtC,MAAM,OAAO,GACT,MAAM,OAAO,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAA;QAEjD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO;gBACH,MAAM,EAAE,OAAO,CAAC,MAAM;aACzB,CAAA;QACL,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;QAEpD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,OAAO,CACjE,EAAE,CACL,CAAA;QAED,MAAM,aAAa,GAAG,wBAAU,CAAC,kBAAkB,CAC/C,iBAAiB,EACjB,OAAO,CACV,CAAA;QAED,OAAO,aAAa,CAAA;IACxB,CAAC;IAEO,eAAe;QACnB,OAAQ,IAAI,CAAC,MAAuB,CAAC,uBAAuB,EAAE,CAAA;IAClE,CAAC;CACJ;
|
|
1
|
+
{"version":3,"file":"SyncAction.js","sourceRoot":"","sources":["../../../../src/features/event/actions/SyncAction.ts"],"names":[],"mappings":";;;;;AACA,4HAAiG;AACjG,uFAA0D;AAC1D,0EAAiD;AAOjD,MAAqB,UAAW,SAAQ,wBAA6B;IAC1D,cAAc,GAAG,CAAC,aAAa,CAAC,CAAA;IAChC,aAAa,GAAkB,iCAAqB,CAAA;IACpD,iBAAiB,GAAG,+BAA+B,CAAA;IAEnD,KAAK,CAAC,OAAO,CAAC,OAAgB;QACjC,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,EAAE,CAAA;QAEtC,MAAM,OAAO,CAAC,sBAAsB,CAAC;YACjC,GAAG,OAAO;YACV,0BAA0B,EAAE,IAAI;SACnC,CAAC,CAAA;QAEF,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,gBAAgB,CAAC;YACxC,GAAG,OAAO;YACV,0BAA0B,EAAE,IAAI;SACnC,CAAC,CAAA;QAEF,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC;YACxC,uBAAuB,EAAE,KAAK;SACjC,CAAC,CAAA;QAEF,MAAM,OAAO,GACT,MAAM,OAAO,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAA;QAEjD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO;gBACH,MAAM,EAAE,OAAO,CAAC,MAAM;aACzB,CAAA;QACL,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;QAEpD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,OAAO,CACjE,EAAE,CACL,CAAA;QAED,MAAM,aAAa,GAAG,wBAAU,CAAC,kBAAkB,CAC/C,iBAAiB,EACjB,OAAO,CACV,CAAA;QAED,OAAO,aAAa,CAAA;IACxB,CAAC;IAEO,eAAe;QACnB,OAAQ,IAAI,CAAC,MAAuB,CAAC,uBAAuB,EAAE,CAAA;IAClE,CAAC;CACJ;AAhDD,6BAgDC"}
|
|
@@ -6,8 +6,6 @@ import { FeatureActionResponse } from '../../features.types';
|
|
|
6
6
|
import SkillStore from '../../skill/stores/SkillStore';
|
|
7
7
|
import EventStore from '../stores/EventStore';
|
|
8
8
|
import EventWriter from '../writers/EventWriter';
|
|
9
|
-
type OptionsSchema = SpruceSchemas.SpruceCli.v2020_07_22.SyncEventOptionsSchema;
|
|
10
|
-
type Options = SpruceSchemas.SpruceCli.v2020_07_22.SyncEventOptions;
|
|
11
9
|
export default class EventContractBuilder {
|
|
12
10
|
private optionsSchema;
|
|
13
11
|
private ui;
|
|
@@ -25,12 +23,16 @@ export default class EventContractBuilder {
|
|
|
25
23
|
skillStore: SkillStore;
|
|
26
24
|
dependencyService: DependencyService;
|
|
27
25
|
});
|
|
28
|
-
fetchAndWriteContracts(options: Options
|
|
26
|
+
fetchAndWriteContracts(options: Options & {
|
|
27
|
+
shouldOnlySyncRemoteEvents?: boolean;
|
|
28
|
+
}): Promise<FeatureActionResponse>;
|
|
29
29
|
private deleteOrphanedEventContracts;
|
|
30
|
-
fetchContractsAndGenerateUniqueSchemas(existingSchemas: Schema[], shouldSyncOnlyCoreEvents: boolean): Promise<FeatureActionResponse & {
|
|
30
|
+
fetchContractsAndGenerateUniqueSchemas(existingSchemas: Schema[], shouldSyncOnlyCoreEvents: boolean, shouldOnlySyncRemoteEvents?: boolean): Promise<FeatureActionResponse & {
|
|
31
31
|
schemas?: Schema[];
|
|
32
32
|
}>;
|
|
33
33
|
private filterSchemasBasedOnCallbackPayload;
|
|
34
34
|
private fetchAndBuildTemplateItems;
|
|
35
35
|
}
|
|
36
|
+
type OptionsSchema = SpruceSchemas.SpruceCli.v2020_07_22.SyncEventOptionsSchema;
|
|
37
|
+
type Options = SpruceSchemas.SpruceCli.v2020_07_22.SyncEventOptions;
|
|
36
38
|
export {};
|
|
@@ -27,12 +27,14 @@ class EventContractBuilder {
|
|
|
27
27
|
this.dependencyService = options.dependencyService;
|
|
28
28
|
}
|
|
29
29
|
async fetchAndWriteContracts(options) {
|
|
30
|
-
const
|
|
30
|
+
const { shouldOnlySyncRemoteEvents, ...rest } = options;
|
|
31
|
+
const normalizedOptions = validateAndNormalize_utility_1.default.validateAndNormalize(this.optionsSchema, rest);
|
|
31
32
|
const { contractDestinationDir } = normalizedOptions;
|
|
32
33
|
const resolvedDestination = spruce_skill_utils_1.diskUtil.resolvePath(this.cwd, contractDestinationDir);
|
|
33
34
|
const { errors, schemaTemplateItems, eventContractTemplateItems } = await this.fetchAndBuildTemplateItems({
|
|
34
35
|
shouldSyncOnlyCoreEvents: options.shouldSyncOnlyCoreEvents ?? false,
|
|
35
36
|
eventBuilderFile: normalizedOptions.eventBuilderFile,
|
|
37
|
+
shouldOnlySyncRemoteEvents,
|
|
36
38
|
});
|
|
37
39
|
if (errors && errors?.length > 0) {
|
|
38
40
|
return {
|
|
@@ -57,8 +59,11 @@ class EventContractBuilder {
|
|
|
57
59
|
diff.forEach((f) => spruce_skill_utils_1.diskUtil.deleteFile(f));
|
|
58
60
|
spruce_skill_utils_1.diskUtil.deleteEmptyDirs(lookupDir);
|
|
59
61
|
}
|
|
60
|
-
async fetchContractsAndGenerateUniqueSchemas(existingSchemas, shouldSyncOnlyCoreEvents) {
|
|
61
|
-
const { errors, schemaTemplateItems } = await this.fetchAndBuildTemplateItems({
|
|
62
|
+
async fetchContractsAndGenerateUniqueSchemas(existingSchemas, shouldSyncOnlyCoreEvents, shouldOnlySyncRemoteEvents) {
|
|
63
|
+
const { errors, schemaTemplateItems } = await this.fetchAndBuildTemplateItems({
|
|
64
|
+
shouldSyncOnlyCoreEvents,
|
|
65
|
+
shouldOnlySyncRemoteEvents,
|
|
66
|
+
});
|
|
62
67
|
if (errors && errors?.length > 0) {
|
|
63
68
|
return {
|
|
64
69
|
errors,
|
|
@@ -78,7 +83,7 @@ class EventContractBuilder {
|
|
|
78
83
|
return filteredSchemas;
|
|
79
84
|
}
|
|
80
85
|
async fetchAndBuildTemplateItems(options) {
|
|
81
|
-
const { shouldSyncOnlyCoreEvents, eventBuilderFile } = options;
|
|
86
|
+
const { shouldSyncOnlyCoreEvents, eventBuilderFile, shouldOnlySyncRemoteEvents, } = options;
|
|
82
87
|
this.ui.startLoading('Loading skill details...');
|
|
83
88
|
let namespace = await this.skillStore.loadCurrentSkillsNamespace();
|
|
84
89
|
this.ui.startLoading('Fetching event contracts...');
|
|
@@ -88,6 +93,7 @@ class EventContractBuilder {
|
|
|
88
93
|
const contractResults = await this.eventStore.fetchEventContracts({
|
|
89
94
|
localNamespace: namespace,
|
|
90
95
|
namespaces,
|
|
96
|
+
shouldOnlySyncRemoteEvents,
|
|
91
97
|
didUpdateHandler: (msg) => {
|
|
92
98
|
this.ui.startLoading(msg);
|
|
93
99
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventContractBuilder.js","sourceRoot":"","sources":["../../../../src/features/event/builders/EventContractBuilder.ts"],"names":[],"mappings":";;;;;AAAA,gEAAuC;AAEvC,+CAI2B;AAC3B,uEAAoE;AACpE,mCAAgC;AAEhC,sHAA6F;AAI7F,sGAAsE;
|
|
1
|
+
{"version":3,"file":"EventContractBuilder.js","sourceRoot":"","sources":["../../../../src/features/event/builders/EventContractBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ export default class EventCacheService {
|
|
|
5
5
|
getLastSyncOptions(): any;
|
|
6
6
|
setLastSyncCache(options: {
|
|
7
7
|
shouldSyncOnlyCoreEvents?: boolean | null;
|
|
8
|
+
shouldOnlySyncRemoteEvents?: boolean | null;
|
|
8
9
|
}): void;
|
|
9
10
|
setListenerCache(value: Record<string, any>): void;
|
|
10
11
|
clearListenerCache(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventCacheService.js","sourceRoot":"","sources":["../../../../src/features/event/services/EventCacheService.ts"],"names":[],"mappings":";;AAEA,MAAqB,iBAAiB;IACxB,QAAQ,CAAyB;IAE3C,YAAmB,QAAyB;QACxC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAA;IAC7C,CAAC;IAEM,kBAAkB;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;IAC/C,CAAC;IAEM,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"EventCacheService.js","sourceRoot":"","sources":["../../../../src/features/event/services/EventCacheService.ts"],"names":[],"mappings":";;AAEA,MAAqB,iBAAiB;IACxB,QAAQ,CAAyB;IAE3C,YAAmB,QAAyB;QACxC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAA;IAC7C,CAAC;IAEM,kBAAkB;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;IAC/C,CAAC;IAEM,gBAAgB,CAAC,OAGvB;QACG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;IACjD,CAAC;IAEM,gBAAgB,CAAC,KAA0B;QAC9C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;IACxD,CAAC;IAEM,kBAAkB;QACrB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAA;IACnD,CAAC;IAEM,gBAAgB;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;IACxD,CAAC;CACJ;AA9BD,oCA8BC"}
|
|
@@ -22,7 +22,7 @@ class EventStore extends AbstractStore_1.default {
|
|
|
22
22
|
EventStore.contractCache = {};
|
|
23
23
|
}
|
|
24
24
|
async fetchEventContracts(options) {
|
|
25
|
-
const { localNamespace, didUpdateHandler, namespaces } = options ?? {};
|
|
25
|
+
const { localNamespace, didUpdateHandler, namespaces, shouldOnlySyncRemoteEvents, } = options ?? {};
|
|
26
26
|
didUpdateHandler?.('Pulling remote contracts...');
|
|
27
27
|
let contracts;
|
|
28
28
|
try {
|
|
@@ -32,6 +32,12 @@ class EventStore extends AbstractStore_1.default {
|
|
|
32
32
|
const error = err.options.responseErrors?.[0] ?? err;
|
|
33
33
|
throw error;
|
|
34
34
|
}
|
|
35
|
+
if (shouldOnlySyncRemoteEvents) {
|
|
36
|
+
return {
|
|
37
|
+
contracts,
|
|
38
|
+
errors: [],
|
|
39
|
+
};
|
|
40
|
+
}
|
|
35
41
|
const localContract = localNamespace &&
|
|
36
42
|
(await this.loadLocalContract(localNamespace, didUpdateHandler));
|
|
37
43
|
if (localNamespace) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventStore.js","sourceRoot":"","sources":["../../../../src/features/event/stores/EventStore.ts"],"names":[],"mappings":";;;;;AAAA,gDAA2B;AAC3B,gEAAuC;AACvC,6DAMkC;AAClC,+CAA2D;AAC3D,uEAMuC;AACvC,uEAAoE;AACpE,mCAAkC;AAClC,8EAAqD;AACrD,kFAAyD;AAEzD,kGAA0F;AAE1F,MAAqB,UAAW,SAAQ,uBAAa;IAC1C,IAAI,GAAG,OAAO,CAAA;IACX,MAAM,CAAC,aAAa,GAAwB,EAAE,CAAA;IAChD,MAAM,CAAC,eAAe,CAAkD;IAEzE,MAAM,CAAC,UAAU;QACpB,UAAU,CAAC,eAAe,GAAG,SAAS,CAAA;QACtC,UAAU,CAAC,aAAa,GAAG,EAAE,CAAA;IACjC,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAC5B,OAA+B;QAE/B,MAAM,
|
|
1
|
+
{"version":3,"file":"EventStore.js","sourceRoot":"","sources":["../../../../src/features/event/stores/EventStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ const universalDevDependencies = [
|
|
|
8
8
|
{ name: 'eslint-config-spruce', isDev: true },
|
|
9
9
|
{ name: 'prettier', isDev: true },
|
|
10
10
|
{ name: 'chokidar-cli', isDev: true },
|
|
11
|
-
{ name: 'concurrently', isDev: true },
|
|
12
11
|
{ name: 'tsc-watch', isDev: true },
|
|
13
12
|
{ name: 'ts-node', isDev: true },
|
|
14
13
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"universalDevDependencies.js","sourceRoot":"","sources":["../../src/features/universalDevDependencies.ts"],"names":[],"mappings":";;AAAA,MAAM,wBAAwB,GAAG;IAC7B,EAAE,IAAI,EAAE,kCAAkC,EAAE,KAAK,EAAE,IAAI,EAAE;IACzD,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE;IACnC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE;IAC/B,EAAE,IAAI,EAAE,sBAAsB,EAAE,KAAK,EAAE,IAAI,EAAE;IAC7C,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE;IACjC,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,IAAI,EAAE;IACrC,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"universalDevDependencies.js","sourceRoot":"","sources":["../../src/features/universalDevDependencies.ts"],"names":[],"mappings":";;AAAA,MAAM,wBAAwB,GAAG;IAC7B,EAAE,IAAI,EAAE,kCAAkC,EAAE,KAAK,EAAE,IAAI,EAAE;IACzD,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE;IACnC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE;IAC/B,EAAE,IAAI,EAAE,sBAAsB,EAAE,KAAK,EAAE,IAAI,EAAE;IAC7C,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE;IACjC,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,IAAI,EAAE;IACrC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE;IAClC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE;CACnC,CAAA;AAED,kBAAe,wBAAwB,CAAA"}
|
|
@@ -19,7 +19,6 @@ const universalScripts = {
|
|
|
19
19
|
'resolve-paths.lint': 'yarn run build.resolve-paths ; yarn run lint',
|
|
20
20
|
test: 'jest',
|
|
21
21
|
'watch.build.dev': "tsc-watch --sourceMap --onCompilationComplete 'yarn run post.watch.build'",
|
|
22
|
-
'watch.lint': "concurrently 'yarn run lint' \"chokidar 'src/**/*' -c 'yarn run lint.tsc'\"",
|
|
23
22
|
'watch.rebuild': 'yarn run clean.all && yarn install && yarn run watch.build.dev',
|
|
24
23
|
'watch.tsc': 'tsc -w',
|
|
25
24
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"universalScripts.js","sourceRoot":"","sources":["../../src/features/universalScripts.ts"],"names":[],"mappings":";;AAAA,MAAM,gBAAgB,GAAG;IACrB,UAAU,EACN,qEAAqE;IACzE,WAAW,EAAE,8DAA8D;IAC3E,kBAAkB,EACd,gEAAgE;IACpE,qBAAqB,EACjB,oEAAoE;IACxE,WAAW,EAAE,kCAAkC;IAC/C,KAAK,EAAE,sBAAsB;IAC7B,WAAW,EAAE,qDAAqD;IAClE,aAAa,EAAE,eAAe;IAC9B,oBAAoB,EAAE,kDAAkD;IACxE,UAAU,EAAE,gCAAgC;IAC5C,IAAI,EAAE,0BAA0B;IAChC,UAAU,EAAE,mBAAmB;IAC/B,kBAAkB,EACd,2DAA2D;IAC/D,OAAO,EAAE,0DAA0D;IACnE,qBAAqB,EAAE,qCAAqC;IAC5D,oBAAoB,EAAE,8CAA8C;IACpE,IAAI,EAAE,MAAM;IACZ,iBAAiB,EACb,2EAA2E;IAC/E,
|
|
1
|
+
{"version":3,"file":"universalScripts.js","sourceRoot":"","sources":["../../src/features/universalScripts.ts"],"names":[],"mappings":";;AAAA,MAAM,gBAAgB,GAAG;IACrB,UAAU,EACN,qEAAqE;IACzE,WAAW,EAAE,8DAA8D;IAC3E,kBAAkB,EACd,gEAAgE;IACpE,qBAAqB,EACjB,oEAAoE;IACxE,WAAW,EAAE,kCAAkC;IAC/C,KAAK,EAAE,sBAAsB;IAC7B,WAAW,EAAE,qDAAqD;IAClE,aAAa,EAAE,eAAe;IAC9B,oBAAoB,EAAE,kDAAkD;IACxE,UAAU,EAAE,gCAAgC;IAC5C,IAAI,EAAE,0BAA0B;IAChC,UAAU,EAAE,mBAAmB;IAC/B,kBAAkB,EACd,2DAA2D;IAC/D,OAAO,EAAE,0DAA0D;IACnE,qBAAqB,EAAE,qCAAqC;IAC5D,oBAAoB,EAAE,8CAA8C;IACpE,IAAI,EAAE,MAAM;IACZ,iBAAiB,EACb,2EAA2E;IAC/E,eAAe,EACX,gEAAgE;IACpE,WAAW,EAAE,QAAQ;CACxB,CAAA;AAED,kBAAe,gBAAgB,CAAA"}
|
|
@@ -6,6 +6,7 @@ export default class LintService {
|
|
|
6
6
|
private static isLintingEnabled;
|
|
7
7
|
static disableLinting(): void;
|
|
8
8
|
static enableLinting(): void;
|
|
9
|
+
static shouldIgnorePattern(pattern: string): boolean;
|
|
9
10
|
constructor(cwd: string, commandServiceFactory: () => CommandService);
|
|
10
11
|
fix: (pattern: string) => Promise<string[]>;
|
|
11
12
|
}
|
|
@@ -23,6 +23,9 @@ class LintService {
|
|
|
23
23
|
static enableLinting() {
|
|
24
24
|
this.isLintingEnabled = true;
|
|
25
25
|
}
|
|
26
|
+
static shouldIgnorePattern(pattern) {
|
|
27
|
+
return !!LintService.ignorePatterns.find((p) => p.includes(pattern) || pattern.includes(p));
|
|
28
|
+
}
|
|
26
29
|
constructor(cwd, commandServiceFactory) {
|
|
27
30
|
this.cwd = cwd;
|
|
28
31
|
this.getCommand = commandServiceFactory;
|
|
@@ -35,7 +38,7 @@ class LintService {
|
|
|
35
38
|
});
|
|
36
39
|
}
|
|
37
40
|
if (!LintService.isLintingEnabled ||
|
|
38
|
-
|
|
41
|
+
LintService.shouldIgnorePattern(pattern)) {
|
|
39
42
|
return [];
|
|
40
43
|
}
|
|
41
44
|
// let fixedFiles: any = {}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LintService.js","sourceRoot":"","sources":["../../src/services/LintService.ts"],"names":[],"mappings":";;;;;AAAA,+CAAgD;AAChD,kCAAkC;AAClC,4BAA4B;AAC5B,wEAA+C;AAG/C,MAAqB,WAAW;IACrB,GAAG,CAAQ;IACV,UAAU,CAAsB;IACjC,MAAM,CAAC,cAAc,GAAa;QACrC,eAAe;QACf,KAAK;QACL,KAAK;QACL,YAAY;KACf,CAAA;IAEO,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAA;IAE/B,MAAM,CAAC,cAAc;QACxB,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAA;IACjC,CAAC;IAEM,MAAM,CAAC,aAAa;QACvB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAA;IAChC,CAAC;IAED,YACI,GAAW,EACX,qBAA2C;QAE3C,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,UAAU,GAAG,qBAAqB,CAAA;IAC3C,CAAC;IAEM,GAAG,GAAG,KAAK,EAAE,OAAe,EAAqB,EAAE;QACtD,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,MAAM,IAAI,oBAAW,CAAC;gBAClB,IAAI,EAAE,oBAAoB;gBAC1B,UAAU,EAAE,CAAC,SAAS,CAAC;aAC1B,CAAC,CAAA;QACN,CAAC;QAED,IACI,CAAC,WAAW,CAAC,gBAAgB;YAC7B,
|
|
1
|
+
{"version":3,"file":"LintService.js","sourceRoot":"","sources":["../../src/services/LintService.ts"],"names":[],"mappings":";;;;;AAAA,+CAAgD;AAChD,kCAAkC;AAClC,4BAA4B;AAC5B,wEAA+C;AAG/C,MAAqB,WAAW;IACrB,GAAG,CAAQ;IACV,UAAU,CAAsB;IACjC,MAAM,CAAC,cAAc,GAAa;QACrC,eAAe;QACf,KAAK;QACL,KAAK;QACL,YAAY;KACf,CAAA;IAEO,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAA;IAE/B,MAAM,CAAC,cAAc;QACxB,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAA;IACjC,CAAC;IAEM,MAAM,CAAC,aAAa;QACvB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAA;IAChC,CAAC;IAEM,MAAM,CAAC,mBAAmB,CAAC,OAAe;QAC7C,OAAO,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,CACpC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CACpD,CAAA;IACL,CAAC;IAED,YACI,GAAW,EACX,qBAA2C;QAE3C,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,UAAU,GAAG,qBAAqB,CAAA;IAC3C,CAAC;IAEM,GAAG,GAAG,KAAK,EAAE,OAAe,EAAqB,EAAE;QACtD,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,MAAM,IAAI,oBAAW,CAAC;gBAClB,IAAI,EAAE,oBAAoB;gBAC1B,UAAU,EAAE,CAAC,SAAS,CAAC;aAC1B,CAAC,CAAA;QACN,CAAC;QAED,IACI,CAAC,WAAW,CAAC,gBAAgB;YAC7B,WAAW,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAC1C,CAAC;YACC,OAAO,EAAE,CAAA;QACb,CAAC;QAED,2BAA2B;QAC3B,MAAM,UAAU,GAAa,EAAE,CAAA;QAE/B,IAAI,CAAC;YACD,oEAAoE;YACpE,8CAA8C;YAC9C,MAAM,MAAM,GAAG,6GAA6G,IAAI,CAAC,GAAG,2DAA2D,OAAO,wCAAwC,CAAA;YAE9O,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE;gBACpC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC;aACvB,CAAC,CAAA;YAEF,qBAAqB;QACzB,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAChB,MAAM,IAAI,qBAAW,CAAC;gBAClB,IAAI,EAAE,aAAa;gBACnB,OAAO;gBACP,aAAa,EAAE,GAAG;aACrB,CAAC,CAAA;QACN,CAAC;QAED,oBAAoB;QACpB,4CAA4C;QAC5C,mCAAmC;QACnC,uEAAuE;QACvE,kDAAkD;QAClD,yEAAyE;QACzE,sCAAsC;QACtC,uCAAuC;QACvC,2BAA2B;QAC3B,wDAAwD;QACxD,yCAAyC;QACzC,8CAA8C;QAC9C,mDAAmD;QACnD,qCAAqC;QACrC,iBAAiB;QACjB,YAAY;QACZ,QAAQ;QACR,IAAI;QAEJ,OAAO,UAAU,CAAA;IACrB,CAAC,CAAA;;AA1FL,8BA2FC"}
|
|
@@ -7,6 +7,7 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const spruce_skill_utils_1 = require("@sprucelabs/spruce-skill-utils");
|
|
9
9
|
const constants_1 = require("../constants");
|
|
10
|
+
const LintService_1 = __importDefault(require("../services/LintService"));
|
|
10
11
|
class AbstractWriter {
|
|
11
12
|
templates;
|
|
12
13
|
ui;
|
|
@@ -27,7 +28,8 @@ class AbstractWriter {
|
|
|
27
28
|
this.settings = options.settings;
|
|
28
29
|
}
|
|
29
30
|
async lint(file) {
|
|
30
|
-
|
|
31
|
+
const shouldLint = !LintService_1.default.shouldIgnorePattern(file);
|
|
32
|
+
if (this.isLintEnabled && shouldLint) {
|
|
31
33
|
this.ui.startLoading(`Linting ${path_1.default.basename(file)}...`);
|
|
32
34
|
await this.linter?.fix(file).catch(() => { });
|
|
33
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractWriter.js","sourceRoot":"","sources":["../../src/writers/AbstractWriter.ts"],"names":[],"mappings":";;;;;AAAA,4CAAmB;AACnB,gDAA2B;AAC3B,uEAA0E;AAE1E,4CAIqB;
|
|
1
|
+
{"version":3,"file":"AbstractWriter.js","sourceRoot":"","sources":["../../src/writers/AbstractWriter.ts"],"names":[],"mappings":"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"}
|
package/eslint.config.mjs
CHANGED
package/package.json
CHANGED
|
@@ -13,11 +13,12 @@
|
|
|
13
13
|
"inquirer-file-tree-selection-prompt",
|
|
14
14
|
"ora",
|
|
15
15
|
"terminal-image",
|
|
16
|
-
"terminal-kit"
|
|
16
|
+
"terminal-kit",
|
|
17
|
+
"open"
|
|
17
18
|
]
|
|
18
19
|
},
|
|
19
20
|
"license": "MIT",
|
|
20
|
-
"version": "21.0.
|
|
21
|
+
"version": "21.0.5",
|
|
21
22
|
"bin": {
|
|
22
23
|
"spruce": "./build/index.js"
|
|
23
24
|
},
|
|
@@ -73,20 +74,20 @@
|
|
|
73
74
|
},
|
|
74
75
|
"dependencies": {
|
|
75
76
|
"@jest/reporters": "^29.7.0",
|
|
76
|
-
"@sprucelabs/error": "^6.0.
|
|
77
|
-
"@sprucelabs/globby": "^2.0.
|
|
78
|
-
"@sprucelabs/heartwood-view-controllers": "^110.0.
|
|
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.0.
|
|
85
|
-
"@sprucelabs/spruce-event-utils": "^40.0.
|
|
86
|
-
"@sprucelabs/spruce-skill-utils": "^31.0.
|
|
87
|
-
"@sprucelabs/spruce-templates": "^21.0.
|
|
88
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
89
|
-
"@typescript-eslint/parser": "^
|
|
77
|
+
"@sprucelabs/error": "^6.0.11",
|
|
78
|
+
"@sprucelabs/globby": "^2.0.10",
|
|
79
|
+
"@sprucelabs/heartwood-view-controllers": "^110.0.4",
|
|
80
|
+
"@sprucelabs/jest-json-reporter": "^8.0.12",
|
|
81
|
+
"@sprucelabs/mercury-client": "^42.0.11",
|
|
82
|
+
"@sprucelabs/mercury-event-emitter": "^42.0.11",
|
|
83
|
+
"@sprucelabs/mercury-types": "^47.0.11",
|
|
84
|
+
"@sprucelabs/schema": "^30.0.15",
|
|
85
|
+
"@sprucelabs/spruce-core-schemas": "^40.0.11",
|
|
86
|
+
"@sprucelabs/spruce-event-utils": "^40.0.11",
|
|
87
|
+
"@sprucelabs/spruce-skill-utils": "^31.0.15",
|
|
88
|
+
"@sprucelabs/spruce-templates": "^21.0.5",
|
|
89
|
+
"@typescript-eslint/eslint-plugin": "^7.7.1",
|
|
90
|
+
"@typescript-eslint/parser": "^7.7.1",
|
|
90
91
|
"cfonts": "^3.2.0",
|
|
91
92
|
"chalk": "4.1.2",
|
|
92
93
|
"chokidar": "^3.6.0",
|
|
@@ -111,20 +112,20 @@
|
|
|
111
112
|
"uuid": "^9.0.1"
|
|
112
113
|
},
|
|
113
114
|
"devDependencies": {
|
|
114
|
-
"@sprucelabs/data-stores": "^27.0.
|
|
115
|
+
"@sprucelabs/data-stores": "^27.0.14",
|
|
115
116
|
"@sprucelabs/jest-sheets-reporter": "^3.0.26",
|
|
116
|
-
"@sprucelabs/mercury-core-events": "^24.0.
|
|
117
|
-
"@sprucelabs/resolve-path-aliases": "^2.0.
|
|
118
|
-
"@sprucelabs/spruce-conversation-plugin": "^62.0.
|
|
119
|
-
"@sprucelabs/spruce-deploy-plugin": "^62.0.
|
|
120
|
-
"@sprucelabs/spruce-store-plugin": "^62.0.
|
|
121
|
-
"@sprucelabs/spruce-test-fixtures": "^62.0.
|
|
122
|
-
"@sprucelabs/test": "^9.0.
|
|
123
|
-
"@sprucelabs/test-utils": "^5.0.
|
|
117
|
+
"@sprucelabs/mercury-core-events": "^24.0.6",
|
|
118
|
+
"@sprucelabs/resolve-path-aliases": "^2.0.13",
|
|
119
|
+
"@sprucelabs/spruce-conversation-plugin": "^62.0.2",
|
|
120
|
+
"@sprucelabs/spruce-deploy-plugin": "^62.0.2",
|
|
121
|
+
"@sprucelabs/spruce-store-plugin": "^62.0.2",
|
|
122
|
+
"@sprucelabs/spruce-test-fixtures": "^62.0.2",
|
|
123
|
+
"@sprucelabs/test": "^9.0.9",
|
|
124
|
+
"@sprucelabs/test-utils": "^5.0.10",
|
|
124
125
|
"@types/blessed": "^0.1.25",
|
|
125
|
-
"@types/eslint": "^8.56.
|
|
126
|
+
"@types/eslint": "^8.56.10",
|
|
126
127
|
"@types/fs-extra": "^11.0.4",
|
|
127
|
-
"@types/inquirer": "^
|
|
128
|
+
"@types/inquirer": "^9.0.7",
|
|
128
129
|
"@types/lodash": "^4.17.0",
|
|
129
130
|
"@types/md5": "^2.3.5",
|
|
130
131
|
"@types/node": "^20.12.7",
|
|
@@ -140,14 +141,14 @@
|
|
|
140
141
|
"concurrently": "^8.2.2",
|
|
141
142
|
"conventional-changelog-sprucelabs": "^2.0.1",
|
|
142
143
|
"dotenv": "^16.4.5",
|
|
143
|
-
"eslint": "^9.
|
|
144
|
-
"eslint-config-spruce": "^11.2.
|
|
144
|
+
"eslint": "^9.1.1",
|
|
145
|
+
"eslint-config-spruce": "^11.2.14",
|
|
145
146
|
"find-process": "^1.4.7",
|
|
146
147
|
"jest": "^29.7.0",
|
|
147
148
|
"jest-circus": "^29.7.0",
|
|
148
149
|
"jest-junit": "^16.0.0",
|
|
149
150
|
"jest-reporters": "^0.0.2",
|
|
150
|
-
"prettier": "^3.
|
|
151
|
+
"prettier": "^3.2.5",
|
|
151
152
|
"ps-node": "^0.1.6",
|
|
152
153
|
"ts-jest": "^29.1.2",
|
|
153
154
|
"ts-node": "^10.9.2",
|
|
@@ -585,8 +586,10 @@
|
|
|
585
586
|
"inquirer-file-tree-selection-prompt",
|
|
586
587
|
"ora",
|
|
587
588
|
"terminal-image",
|
|
588
|
-
"terminal-kit"
|
|
589
|
+
"terminal-kit",
|
|
590
|
+
"inquirer",
|
|
591
|
+
"open"
|
|
589
592
|
]
|
|
590
593
|
},
|
|
591
|
-
"gitHead": "
|
|
594
|
+
"gitHead": "bd36ac5af388eb1fec5c4a90342c7d7bce26f446"
|
|
592
595
|
}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { diskUtil } from '@sprucelabs/spruce-skill-utils'
|
|
2
|
+
import { test, assert } from '@sprucelabs/test-utils'
|
|
3
|
+
import AbstractSkillTest from '../../../tests/AbstractSkillTest'
|
|
4
|
+
|
|
5
|
+
export default class UsingBuildersFromRemoteContractsTest extends AbstractSkillTest {
|
|
6
|
+
protected static skillCacheKey = 'views'
|
|
7
|
+
|
|
8
|
+
@test()
|
|
9
|
+
protected static async canCreateBuilderThatReferencesRemoteSkillsSchema() {
|
|
10
|
+
const path = "'#spruce/schemas/heartwood/v2021_02_11/theme.schema'"
|
|
11
|
+
const builderContents = `import { buildSchema } from '@sprucelabs/schema'
|
|
12
|
+
// eslint-disable-next-line spruce/prohibit-import-of-schema-in-builders
|
|
13
|
+
import themeSchema from ${path}
|
|
14
|
+
|
|
15
|
+
export default buildSchema({
|
|
16
|
+
id: 'theme',
|
|
17
|
+
name: 'Theme',
|
|
18
|
+
fields: {
|
|
19
|
+
...themeSchema.fields,
|
|
20
|
+
fieldName1: {
|
|
21
|
+
type: 'text',
|
|
22
|
+
label: 'First Field',
|
|
23
|
+
isRequired: true,
|
|
24
|
+
},
|
|
25
|
+
fieldName2: {
|
|
26
|
+
type: 'number',
|
|
27
|
+
label: 'Second Field',
|
|
28
|
+
isRequired: true,
|
|
29
|
+
hint: 'A hint',
|
|
30
|
+
},
|
|
31
|
+
},
|
|
32
|
+
})
|
|
33
|
+
`
|
|
34
|
+
|
|
35
|
+
const destination = this.resolvePath(
|
|
36
|
+
'src/schemas/v2024_04_24/theme.builder.ts'
|
|
37
|
+
)
|
|
38
|
+
|
|
39
|
+
diskUtil.writeFile(destination, builderContents)
|
|
40
|
+
const results = await this.Action('event', 'sync').execute({})
|
|
41
|
+
assert.isFalsy(results.errors)
|
|
42
|
+
}
|
|
43
|
+
}
|
|
@@ -189,7 +189,8 @@ export default class EventFeature extends AbstractFeature {
|
|
|
189
189
|
const uniqueSchemas =
|
|
190
190
|
await writer.fetchContractsAndGenerateUniqueSchemas(
|
|
191
191
|
payload.schemas ?? [],
|
|
192
|
-
lastSync.shouldSyncOnlyCoreEvents
|
|
192
|
+
lastSync.shouldSyncOnlyCoreEvents,
|
|
193
|
+
lastSync.shouldOnlySyncRemoteEvents
|
|
193
194
|
)
|
|
194
195
|
|
|
195
196
|
return {
|
|
@@ -16,6 +16,20 @@ export default class SyncAction extends AbstractAction<OptionsSchema> {
|
|
|
16
16
|
public async execute(options: Options): Promise<FeatureActionResponse> {
|
|
17
17
|
const builder = this.ContractBuilder()
|
|
18
18
|
|
|
19
|
+
await builder.fetchAndWriteContracts({
|
|
20
|
+
...options,
|
|
21
|
+
shouldOnlySyncRemoteEvents: true,
|
|
22
|
+
})
|
|
23
|
+
|
|
24
|
+
this.Service('eventCache').setLastSyncCache({
|
|
25
|
+
...options,
|
|
26
|
+
shouldOnlySyncRemoteEvents: true,
|
|
27
|
+
})
|
|
28
|
+
|
|
29
|
+
await this.Action('schema', 'sync').execute({
|
|
30
|
+
shouldFetchLocalSchemas: false,
|
|
31
|
+
})
|
|
32
|
+
|
|
19
33
|
const results: FeatureActionResponse =
|
|
20
34
|
await builder.fetchAndWriteContracts(options)
|
|
21
35
|
|
|
@@ -16,9 +16,6 @@ import validateAndNormalizer from '../../validateAndNormalize.utility'
|
|
|
16
16
|
import EventStore from '../stores/EventStore'
|
|
17
17
|
import EventWriter from '../writers/EventWriter'
|
|
18
18
|
|
|
19
|
-
type OptionsSchema = SpruceSchemas.SpruceCli.v2020_07_22.SyncEventOptionsSchema
|
|
20
|
-
type Options = SpruceSchemas.SpruceCli.v2020_07_22.SyncEventOptions
|
|
21
|
-
|
|
22
19
|
export default class EventContractBuilder {
|
|
23
20
|
private optionsSchema: OptionsSchema
|
|
24
21
|
private ui: GraphicsInterface
|
|
@@ -47,11 +44,12 @@ export default class EventContractBuilder {
|
|
|
47
44
|
}
|
|
48
45
|
|
|
49
46
|
public async fetchAndWriteContracts(
|
|
50
|
-
options: Options
|
|
47
|
+
options: Options & { shouldOnlySyncRemoteEvents?: boolean }
|
|
51
48
|
): Promise<FeatureActionResponse> {
|
|
49
|
+
const { shouldOnlySyncRemoteEvents, ...rest } = options
|
|
52
50
|
const normalizedOptions = validateAndNormalizer.validateAndNormalize(
|
|
53
51
|
this.optionsSchema,
|
|
54
|
-
|
|
52
|
+
rest
|
|
55
53
|
)
|
|
56
54
|
|
|
57
55
|
const { contractDestinationDir } = normalizedOptions
|
|
@@ -66,6 +64,7 @@ export default class EventContractBuilder {
|
|
|
66
64
|
shouldSyncOnlyCoreEvents:
|
|
67
65
|
options.shouldSyncOnlyCoreEvents ?? false,
|
|
68
66
|
eventBuilderFile: normalizedOptions.eventBuilderFile,
|
|
67
|
+
shouldOnlySyncRemoteEvents,
|
|
69
68
|
})
|
|
70
69
|
|
|
71
70
|
if (errors && errors?.length > 0) {
|
|
@@ -110,10 +109,14 @@ export default class EventContractBuilder {
|
|
|
110
109
|
|
|
111
110
|
public async fetchContractsAndGenerateUniqueSchemas(
|
|
112
111
|
existingSchemas: Schema[],
|
|
113
|
-
shouldSyncOnlyCoreEvents: boolean
|
|
112
|
+
shouldSyncOnlyCoreEvents: boolean,
|
|
113
|
+
shouldOnlySyncRemoteEvents?: boolean
|
|
114
114
|
): Promise<FeatureActionResponse & { schemas?: Schema[] }> {
|
|
115
115
|
const { errors, schemaTemplateItems } =
|
|
116
|
-
await this.fetchAndBuildTemplateItems({
|
|
116
|
+
await this.fetchAndBuildTemplateItems({
|
|
117
|
+
shouldSyncOnlyCoreEvents,
|
|
118
|
+
shouldOnlySyncRemoteEvents,
|
|
119
|
+
})
|
|
117
120
|
|
|
118
121
|
if (errors && errors?.length > 0) {
|
|
119
122
|
return {
|
|
@@ -149,8 +152,13 @@ export default class EventContractBuilder {
|
|
|
149
152
|
private async fetchAndBuildTemplateItems(options: {
|
|
150
153
|
shouldSyncOnlyCoreEvents?: boolean
|
|
151
154
|
eventBuilderFile?: string
|
|
155
|
+
shouldOnlySyncRemoteEvents?: boolean
|
|
152
156
|
}) {
|
|
153
|
-
const {
|
|
157
|
+
const {
|
|
158
|
+
shouldSyncOnlyCoreEvents,
|
|
159
|
+
eventBuilderFile,
|
|
160
|
+
shouldOnlySyncRemoteEvents,
|
|
161
|
+
} = options
|
|
154
162
|
|
|
155
163
|
this.ui.startLoading('Loading skill details...')
|
|
156
164
|
|
|
@@ -166,6 +174,7 @@ export default class EventContractBuilder {
|
|
|
166
174
|
const contractResults = await this.eventStore.fetchEventContracts({
|
|
167
175
|
localNamespace: namespace,
|
|
168
176
|
namespaces,
|
|
177
|
+
shouldOnlySyncRemoteEvents,
|
|
169
178
|
didUpdateHandler: (msg) => {
|
|
170
179
|
this.ui.startLoading(msg)
|
|
171
180
|
},
|
|
@@ -202,3 +211,6 @@ export default class EventContractBuilder {
|
|
|
202
211
|
}
|
|
203
212
|
}
|
|
204
213
|
}
|
|
214
|
+
|
|
215
|
+
type OptionsSchema = SpruceSchemas.SpruceCli.v2020_07_22.SyncEventOptionsSchema
|
|
216
|
+
type Options = SpruceSchemas.SpruceCli.v2020_07_22.SyncEventOptions
|
|
@@ -35,7 +35,12 @@ export default class EventStore extends AbstractStore {
|
|
|
35
35
|
public async fetchEventContracts(
|
|
36
36
|
options?: FetchContractsOptions
|
|
37
37
|
): Promise<EventStoreFetchEventContractsResponse> {
|
|
38
|
-
const {
|
|
38
|
+
const {
|
|
39
|
+
localNamespace,
|
|
40
|
+
didUpdateHandler,
|
|
41
|
+
namespaces,
|
|
42
|
+
shouldOnlySyncRemoteEvents,
|
|
43
|
+
} = options ?? {}
|
|
39
44
|
|
|
40
45
|
didUpdateHandler?.('Pulling remote contracts...')
|
|
41
46
|
|
|
@@ -47,6 +52,13 @@ export default class EventStore extends AbstractStore {
|
|
|
47
52
|
throw error
|
|
48
53
|
}
|
|
49
54
|
|
|
55
|
+
if (shouldOnlySyncRemoteEvents) {
|
|
56
|
+
return {
|
|
57
|
+
contracts,
|
|
58
|
+
errors: [],
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
|
|
50
62
|
const localContract =
|
|
51
63
|
localNamespace &&
|
|
52
64
|
(await this.loadLocalContract(localNamespace, didUpdateHandler))
|
|
@@ -326,4 +338,5 @@ export interface FetchContractsOptions {
|
|
|
326
338
|
localNamespace?: string
|
|
327
339
|
namespaces?: string[]
|
|
328
340
|
didUpdateHandler?: InternalUpdateHandler
|
|
341
|
+
shouldOnlySyncRemoteEvents?: boolean
|
|
329
342
|
}
|
|
@@ -6,7 +6,6 @@ const universalDevDependencies = [
|
|
|
6
6
|
{ name: 'eslint-config-spruce', isDev: true },
|
|
7
7
|
{ name: 'prettier', isDev: true },
|
|
8
8
|
{ name: 'chokidar-cli', isDev: true },
|
|
9
|
-
{ name: 'concurrently', isDev: true },
|
|
10
9
|
{ name: 'tsc-watch', isDev: true },
|
|
11
10
|
{ name: 'ts-node', isDev: true },
|
|
12
11
|
]
|
|
@@ -22,8 +22,6 @@ const universalScripts = {
|
|
|
22
22
|
test: 'jest',
|
|
23
23
|
'watch.build.dev':
|
|
24
24
|
"tsc-watch --sourceMap --onCompilationComplete 'yarn run post.watch.build'",
|
|
25
|
-
'watch.lint':
|
|
26
|
-
"concurrently 'yarn run lint' \"chokidar 'src/**/*' -c 'yarn run lint.tsc'\"",
|
|
27
25
|
'watch.rebuild':
|
|
28
26
|
'yarn run clean.all && yarn install && yarn run watch.build.dev',
|
|
29
27
|
'watch.tsc': 'tsc -w',
|
|
@@ -24,6 +24,12 @@ export default class LintService {
|
|
|
24
24
|
this.isLintingEnabled = true
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
+
public static shouldIgnorePattern(pattern: string) {
|
|
28
|
+
return !!LintService.ignorePatterns.find(
|
|
29
|
+
(p) => p.includes(pattern) || pattern.includes(p)
|
|
30
|
+
)
|
|
31
|
+
}
|
|
32
|
+
|
|
27
33
|
public constructor(
|
|
28
34
|
cwd: string,
|
|
29
35
|
commandServiceFactory: () => CommandService
|
|
@@ -42,9 +48,7 @@ export default class LintService {
|
|
|
42
48
|
|
|
43
49
|
if (
|
|
44
50
|
!LintService.isLintingEnabled ||
|
|
45
|
-
|
|
46
|
-
(p) => p.includes(pattern) || pattern.includes(p)
|
|
47
|
-
)
|
|
51
|
+
LintService.shouldIgnorePattern(pattern)
|
|
48
52
|
) {
|
|
49
53
|
return []
|
|
50
54
|
}
|
|
@@ -33,7 +33,8 @@ export default abstract class AbstractWriter {
|
|
|
33
33
|
}
|
|
34
34
|
|
|
35
35
|
protected async lint(file: string) {
|
|
36
|
-
|
|
36
|
+
const shouldLint = !LintService.shouldIgnorePattern(file)
|
|
37
|
+
if (this.isLintEnabled && shouldLint) {
|
|
37
38
|
this.ui.startLoading(`Linting ${pathUtil.basename(file)}...`)
|
|
38
39
|
await this.linter?.fix(file).catch(() => {})
|
|
39
40
|
}
|