@companion-module/base 1.2.0 → 1.2.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.
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [1.2.1](https://github.com/bitfocus/companion-module-base/compare/v1.2.0...v1.2.1) (2023-02-22)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Bug Fixes
|
|
7
|
+
|
|
8
|
+
* imported actions/feedbacks upgraded from -1 instead when not no scripts are needed ([32fa9b5](https://github.com/bitfocus/companion-module-base/commit/32fa9b564092664a2627f57f0309a7fb08d8f755))
|
|
9
|
+
|
|
3
10
|
## [1.2.0](https://github.com/bitfocus/companion-module-base/compare/v1.1.1...v1.2.0) (2023-02-21)
|
|
4
11
|
|
|
5
12
|
|
|
@@ -15,7 +15,7 @@ export declare function runThroughUpgradeScripts(allActions: {
|
|
|
15
15
|
[id: string]: ActionInstance | undefined | null;
|
|
16
16
|
}, allFeedbacks: {
|
|
17
17
|
[id: string]: FeedbackInstance | undefined | null;
|
|
18
|
-
},
|
|
18
|
+
}, defaultUpgradeIndex: number | null, upgradeScripts: CompanionStaticUpgradeScript<any>[], config: unknown, skipConfigUpgrade: boolean): UpgradedDataResponseMessage & {
|
|
19
19
|
updatedConfig: unknown | undefined;
|
|
20
20
|
};
|
|
21
21
|
//# sourceMappingURL=upgrade.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/internal/upgrade.ts"],"names":[],"mappings":"AAAA,OAAO,EAGN,4BAA4B,EAC5B,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAA;AAO/F;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CACvC,UAAU,EAAE;IAAE,CAAC,EAAE,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,GAAG,IAAI,CAAA;CAAE,EAC/D,YAAY,EAAE;IAAE,CAAC,EAAE,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,GAAG,IAAI,CAAA;CAAE,EACnE,
|
|
1
|
+
{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/internal/upgrade.ts"],"names":[],"mappings":"AAAA,OAAO,EAGN,4BAA4B,EAC5B,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAA;AAO/F;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CACvC,UAAU,EAAE;IAAE,CAAC,EAAE,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,GAAG,IAAI,CAAA;CAAE,EAC/D,YAAY,EAAE;IAAE,CAAC,EAAE,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,GAAG,IAAI,CAAA;CAAE,EACnE,mBAAmB,EAAE,MAAM,GAAG,IAAI,EAClC,cAAc,EAAE,4BAA4B,CAAC,GAAG,CAAC,EAAE,EACnD,MAAM,EAAE,OAAO,EACf,iBAAiB,EAAE,OAAO,GACxB,2BAA2B,GAAG;IAChC,aAAa,EAAE,OAAO,GAAG,SAAS,CAAA;CAClC,CAiKA"}
|
package/dist/internal/upgrade.js
CHANGED
|
@@ -16,8 +16,7 @@ function clone(val) {
|
|
|
16
16
|
* @param skipConfigUpgrade Whether to skip upgrading the config
|
|
17
17
|
* @returns The upgraded data that needs persisting
|
|
18
18
|
*/
|
|
19
|
-
function runThroughUpgradeScripts(allActions, allFeedbacks,
|
|
20
|
-
const defaultUpgradeIndex = defaultUpgradeIndex0 ?? -1;
|
|
19
|
+
function runThroughUpgradeScripts(allActions, allFeedbacks, defaultUpgradeIndex, upgradeScripts, config, skipConfigUpgrade) {
|
|
21
20
|
// First we group all the actions and feedbacks by the version they currently are.
|
|
22
21
|
const pendingUpgradesGrouped = new Map();
|
|
23
22
|
const getPendingUpgradeGroup = (i) => {
|
|
@@ -44,7 +43,7 @@ function runThroughUpgradeScripts(allActions, allFeedbacks, defaultUpgradeIndex0
|
|
|
44
43
|
}
|
|
45
44
|
if (!skipConfigUpgrade) {
|
|
46
45
|
// If there is config we still need to upgrade that
|
|
47
|
-
for (let i = defaultUpgradeIndex; i < upgradeScripts.length; i++) {
|
|
46
|
+
for (let i = defaultUpgradeIndex ?? -1; i < upgradeScripts.length; i++) {
|
|
48
47
|
// ensure the group is registered
|
|
49
48
|
getPendingUpgradeGroup(i).config = true;
|
|
50
49
|
}
|
|
@@ -55,7 +54,7 @@ function runThroughUpgradeScripts(allActions, allFeedbacks, defaultUpgradeIndex0
|
|
|
55
54
|
if (pendingUpgradesGrouped.size > 0) {
|
|
56
55
|
// Figure out which script to run first. Note: we track the last index we ran, so it is offset by one
|
|
57
56
|
const pendingUpgradeGroups = Array.from(pendingUpgradesGrouped.keys()).sort();
|
|
58
|
-
const firstUpgradeGroup = Math.min(...pendingUpgradeGroups, defaultUpgradeIndex) + 1;
|
|
57
|
+
const firstUpgradeGroup = Math.min(...pendingUpgradeGroups, defaultUpgradeIndex ?? -1) + 1;
|
|
59
58
|
// Start building arrays of the ids which we are upgrading as we go
|
|
60
59
|
const actionsIdsToUpgrade = [];
|
|
61
60
|
const feedbackIdsToUpgrade = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/internal/upgrade.ts"],"names":[],"mappings":";;;AAMA,kCAA2C;AAE3C,SAAS,KAAK,CAAI,GAAM;IACvB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;AACvC,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAgB,wBAAwB,CACvC,UAA+D,EAC/D,YAAmE,EACnE,
|
|
1
|
+
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/internal/upgrade.ts"],"names":[],"mappings":"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"}
|