@noldova/desktop.build 0.0.1 → 0.0.2
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/api/index.d.ts +2 -0
- package/models/packages/package-manifest.js +8 -2
- package/models/packages/package-manifest.js.map +1 -1
- package/models/packages/package-versions.js +8 -1
- package/models/packages/package-versions.js.map +1 -1
- package/package.json +8 -2
- package/resources.js +14 -1
- package/resources.js.map +1 -1
- package/services/commands/package-smoke.js +47 -7
- package/services/commands/package-smoke.js.map +1 -1
- package/services/commands/package.js +16 -1
- package/services/commands/package.js.map +1 -1
- package/services/modules/module-catalog.js +4 -1
- package/services/modules/module-catalog.js.map +1 -1
- package/services/packages/package-naming.js +3 -0
- package/services/packages/package-naming.js.map +1 -1
- package/services/processes/process-runner.js +16 -1
- package/services/processes/process-runner.js.map +1 -1
- package/services/processes/started-process.js +3 -0
- package/services/processes/started-process.js.map +1 -1
package/api/index.d.ts
CHANGED
|
@@ -78,13 +78,19 @@ export class PackageManifest {
|
|
|
78
78
|
throw new BuildException(Resources.formatManifestPeersMetaInvalid(file), new ExceptionOptions(error));
|
|
79
79
|
}
|
|
80
80
|
const modulesPrefix = await RootManifest.readModulePackagePrefixAsync(root);
|
|
81
|
-
const
|
|
81
|
+
const ownDependencies = Object.entries(dependencies).filter(([name]) => PackageNaming.isOwn(name, modulesPrefix));
|
|
82
|
+
const ownPeers = Object.entries(peers).filter(([name]) => PackageNaming.isOwn(name, modulesPrefix));
|
|
83
|
+
const own = [...ownDependencies, ...ownPeers];
|
|
82
84
|
const unpinned = Object.entries(dependencies).filter(([name, version]) => !PackageNaming.isOwn(name, modulesPrefix) && !Object.isString(version)).map(([name]) => name);
|
|
83
85
|
if (unpinned.length > 0)
|
|
84
86
|
throw new BuildException(Resources.formatManifestUnpinned(file, unpinned));
|
|
85
|
-
const unstamped =
|
|
87
|
+
const unstamped = [...ownDependencies, ...ownPeers.filter(([name]) => !PackageNaming.isSiblingPeer(packageName, name))]
|
|
88
|
+
.filter(([, version]) => version !== Resources.packageVersionPlaceholder).map(([name]) => name);
|
|
86
89
|
if (unstamped.length > 0)
|
|
87
90
|
throw new BuildException(Resources.formatManifestOwnUnstamped(file, unstamped));
|
|
91
|
+
const unranged = ownPeers.filter(([name, version]) => PackageNaming.isSiblingPeer(packageName, name) && version !== Resources.packagePeerRangePlaceholder).map(([name]) => name);
|
|
92
|
+
if (unranged.length > 0)
|
|
93
|
+
throw new BuildException(Resources.formatManifestOwnPeerUnranged(file, unranged));
|
|
88
94
|
let settings;
|
|
89
95
|
try {
|
|
90
96
|
settings = manifest.hasField(Resources.manifestNoldovaField) ? manifest.readObject(Resources.manifestNoldovaField) : JsonReader.fromValue({});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-manifest.js","sourceRoot":"","sources":["../../../../../src/noldova.desktop.build/src/models/packages/package-manifest.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"package-manifest.js","sourceRoot":"","sources":["../../../../../src/noldova.desktop.build/src/models/packages/package-manifest.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,7 @@ export class PackageVersions {
|
|
|
38
38
|
}
|
|
39
39
|
stampManifest(manifest, text) {
|
|
40
40
|
const source = JsonReader.parse(text);
|
|
41
|
-
const stamped = Resources.stampedDependencyFields.filter(t => source.hasField(t)).map(t => [t, Object.fromEntries(Object.entries(source.readObject(t).toJson()).map(([name, version]) => [name, manifest.dependencies.includes(name) ? this.
|
|
41
|
+
const stamped = Resources.stampedDependencyFields.filter(t => source.hasField(t)).map(t => [t, Object.fromEntries(Object.entries(source.readObject(t).toJson()).map(([name, version]) => [name, manifest.dependencies.includes(name) ? this.stampOwn(name, version) : version]))]);
|
|
42
42
|
return JSON.stringify({
|
|
43
43
|
...source.toJson(),
|
|
44
44
|
[Resources.manifestVersionField]: this.of(manifest.name),
|
|
@@ -46,5 +46,12 @@ export class PackageVersions {
|
|
|
46
46
|
...(Object.isNull(this.commit) ? {} : { [Resources.manifestCommitField]: this.commit })
|
|
47
47
|
}, null, Resources.jsonIndent);
|
|
48
48
|
}
|
|
49
|
+
stampOwn(name, source) {
|
|
50
|
+
const version = this.of(name);
|
|
51
|
+
if (source !== Resources.packagePeerRangePlaceholder)
|
|
52
|
+
return version;
|
|
53
|
+
const [major, minor] = version.split(Resources.versionSeparator);
|
|
54
|
+
return Resources.formatVersionRange(version, Resources.formatVersion(Number(major), Number(minor) + 1, 0));
|
|
55
|
+
}
|
|
49
56
|
}
|
|
50
57
|
//# sourceMappingURL=package-versions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-versions.js","sourceRoot":"","sources":["../../../../../src/noldova.desktop.build/src/models/packages/package-versions.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,uBAAuB,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAInD,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,MAAM,OAAO,eAAe;IACT,cAAc,CAA8B;IAE7C,OAAO,CAAS;IAChB,MAAM,CAAgB;IAEtC,YAAmB,OAAe,EAAE,SAAwB,IAAI,EAAE,iBAA8C,IAAI,GAAG,EAAE;QACvH,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC;IAChD,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,OAAsB,EAAE,cAAsB,EAAE,QAAoC,EAAE,SAAwB,IAAI;QAC9I,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC;QAC/C,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;YAC/B,MAAM,IAAI,cAAc,CAAC,SAAS,CAAC,8BAA8B,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QACzF,MAAM,KAAK,GAAG,IAAI,GAAG,CAAiB,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAU,CAAC,CAAC,CAAC,CAAC;QAC5J,MAAM,cAAc,GAAG,IAAI,GAAG,EAAkB,CAAC;QACjD,KAAK,MAAM,QAAQ,IAAI,QAAQ,EAAE,CAAC;YAChC,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAC9C,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC;gBAC9B,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/C,CAAC;QACD,KAAK,MAAM,OAAO,IAAI,MAAM,OAAO,CAAC,wBAAwB,EAAE;YAC5D,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC3D,OAAO,IAAI,eAAe,CAAC,cAAc,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;IACrE,CAAC;IAEM,EAAE,CAAC,IAAY;QACpB,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC;IACvD,CAAC;IAEM,aAAa,CAAC,QAAyB,EAAE,IAAY;QAC1D,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,SAAS,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,WAAW,CAC/G,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"package-versions.js","sourceRoot":"","sources":["../../../../../src/noldova.desktop.build/src/models/packages/package-versions.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@noldova/desktop.build",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.2",
|
|
4
4
|
"description": "Noldova Desktop's app build: from an app's desktop section and module list to its window, its development app, signed packages for each target and a release.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -44,7 +44,13 @@
|
|
|
44
44
|
"@noldova/context.exceptions": ">=0.0.7 <0.1.0",
|
|
45
45
|
"@noldova/context.json": ">=0.0.7 <0.1.0",
|
|
46
46
|
"@noldova/context.text": ">=0.0.7 <0.1.0",
|
|
47
|
+
"@types/node": ">=26.6.6 <27.0.0",
|
|
47
48
|
"electron": "44.9.1"
|
|
48
49
|
},
|
|
49
|
-
"
|
|
50
|
+
"peerDependenciesMeta": {
|
|
51
|
+
"@types/node": {
|
|
52
|
+
"optional": true
|
|
53
|
+
}
|
|
54
|
+
},
|
|
55
|
+
"gitHead": "4a952ab785ad808de592e9428c3feff7dc979e8f"
|
|
50
56
|
}
|
package/resources.js
CHANGED
|
@@ -1138,6 +1138,8 @@ export class Resources {
|
|
|
1138
1138
|
static commonJsScope = `${JSON.stringify({ type: "commonjs" })}\n`;
|
|
1139
1139
|
static builderSegments = [Resources.nodeModulesFolder, "electron-builder", "cli.js"];
|
|
1140
1140
|
static builderOptions = ["--publish", "never", "--config"];
|
|
1141
|
+
static diskImageDetachFailure = "Unable to detach device cleanly";
|
|
1142
|
+
static builderDetachRetry = "electron-builder could not detach the disk image it was making while macOS still held its volume; building the packages again, once.\n";
|
|
1141
1143
|
static builderVariables = new Set([
|
|
1142
1144
|
"PATH", "PATHEXT", "COMSPEC", "SYSTEMROOT", "SYSTEMDRIVE", "WINDIR", "PROCESSOR_ARCHITECTURE", "NUMBER_OF_PROCESSORS",
|
|
1143
1145
|
"HOME", "USERPROFILE", "HOMEDRIVE", "HOMEPATH", "APPDATA", "LOCALAPPDATA", "USER", "USERNAME", "LOGNAME",
|
|
@@ -1365,6 +1367,8 @@ export class Resources {
|
|
|
1365
1367
|
static scopedPackageNameSegments = 2;
|
|
1366
1368
|
static packageNameSegments = 1;
|
|
1367
1369
|
static packageVersionPlaceholder = "__VERSION__";
|
|
1370
|
+
static packageNextMinorPlaceholder = "__NEXT_MINOR__";
|
|
1371
|
+
static packagePeerRangePlaceholder = Resources.formatVersionRange(Resources.packageVersionPlaceholder, Resources.packageNextMinorPlaceholder);
|
|
1368
1372
|
static protocolVersionPlaceholder = ["__PROTOCOL", "VERSION__"].join("_");
|
|
1369
1373
|
static packageNoCoverageExclusions = "[]";
|
|
1370
1374
|
static angularScope = "@angular/";
|
|
@@ -1961,6 +1965,9 @@ export class Resources {
|
|
|
1961
1965
|
static formatManifestOwnUnstamped(file, names) {
|
|
1962
1966
|
return `${file} must depend on ${names.join(Resources.listSeparator)} at version "${Resources.packageVersionPlaceholder}".`;
|
|
1963
1967
|
}
|
|
1968
|
+
static formatManifestOwnPeerUnranged(file, names) {
|
|
1969
|
+
return `${file} must take ${names.join(Resources.listSeparator)} as a peer at "${Resources.packagePeerRangePlaceholder}"; the build stamps the version and its next minor.`;
|
|
1970
|
+
}
|
|
1964
1971
|
static formatModuleVersionsUnreadable(problems) {
|
|
1965
1972
|
return `The build cannot version the module packages: ${problems.join(Resources.problemSeparator)}`;
|
|
1966
1973
|
}
|
|
@@ -2683,6 +2690,9 @@ export class Resources {
|
|
|
2683
2690
|
static formatCatalogAngularPeerRange(subject, peer, needed, minimum) {
|
|
2684
2691
|
return `${subject} needs ${peer} ${String(needed)}, a range that doesn't end at the next major after ${minimum}; an Angular peer takes ${Resources.angularPeerRangeForm}, since only a new Angular major may break a module.`;
|
|
2685
2692
|
}
|
|
2693
|
+
static formatCatalogOrganizationPeerRange(subject, peer, needed, minimum) {
|
|
2694
|
+
return `${subject} needs ${peer} ${String(needed)}, a range that doesn't end at the first version refused after ${minimum}, the next minor below 1.0.0 and the next major from it; a peer on another of the organization's packages takes ${Resources.versionRangeForm}.`;
|
|
2695
|
+
}
|
|
2686
2696
|
static formatCatalogCoreRangeUnnamed(subject, peer, needed, file) {
|
|
2687
2697
|
return `${subject} needs ${peer} ${String(needed)}, a range, but ${file} names no ${Resources.noldovaDesktopField}; a module that accepts a range of Noldova Desktop versions names it there, and each of Noldova Desktop's packages it peers on takes that same range.`;
|
|
2688
2698
|
}
|
|
@@ -2690,7 +2700,7 @@ export class Resources {
|
|
|
2690
2700
|
return `${subject} needs ${peer} ${String(needed)}, but ${file} accepts Noldova Desktop ${range}; each of Noldova Desktop's packages it peers on takes that same range.`;
|
|
2691
2701
|
}
|
|
2692
2702
|
static formatCatalogPeerMismatch(subject, peer, needed, holder, version) {
|
|
2693
|
-
return `${subject} needs ${peer} ${String(needed)}, but ${holder} ${version ?? "none"}; a peer names one exact version, such as 1.2.3, or, for
|
|
2703
|
+
return `${subject} needs ${peer} ${String(needed)}, but ${holder} ${version ?? "none"}; a peer names one exact version, such as 1.2.3, or, for the organization's packages, a range of the form ${Resources.versionRangeForm}, and, for Angular's packages in a window part, ${Resources.angularPeerRangeForm}.`;
|
|
2694
2704
|
}
|
|
2695
2705
|
static formatCatalogOutsideRange(id, version, range) {
|
|
2696
2706
|
return `${id} ${version} accepts Noldova Desktop ${range}`;
|
|
@@ -3072,6 +3082,9 @@ export class Resources {
|
|
|
3072
3082
|
static formatSmokeMainEndedBeforeLauncher(ending, tail) {
|
|
3073
3083
|
return `The main process ${ending} before its launcher connected to the runtime:\n${tail}`;
|
|
3074
3084
|
}
|
|
3085
|
+
static formatSmokeLogsUnwatchable(logs) {
|
|
3086
|
+
return `The launcher's logs folder ${logs} can't be watched for its start log.`;
|
|
3087
|
+
}
|
|
3075
3088
|
static formatSmokeLauncherKeptStartLog(logs, tail) {
|
|
3076
3089
|
return `The main process's launcher still kept its start log in ${logs} ${Resources.smokeStartLimit} ms after the runtime answered, so it never connected:\n${tail}`;
|
|
3077
3090
|
}
|