@noldova/desktop.build 0.0.1 → 0.0.3
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/README.md +1 -1
- package/api/index.d.ts +2 -0
- package/models/modules/module-declaration.js +29 -2
- package/models/modules/module-declaration.js.map +1 -1
- package/models/modules/web-view-keys.js +3 -0
- package/models/modules/web-view-keys.js.map +1 -1
- 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/models/packaging/company-package.js +25 -8
- package/models/packaging/company-package.js.map +1 -1
- package/models/packaging/locked-package.js +28 -6
- package/models/packaging/locked-package.js.map +1 -1
- package/models/packaging/package-target.js +8 -4
- package/models/packaging/package-target.js.map +1 -1
- package/models/release/release-request.js +42 -2
- package/models/release/release-request.js.map +1 -1
- package/models/release/release-version.js +0 -8
- package/models/release/release-version.js.map +1 -1
- package/package.json +8 -2
- package/resources.js +147 -26
- package/resources.js.map +1 -1
- package/services/build-command-line.js +3 -2
- package/services/build-command-line.js.map +1 -1
- package/services/commands/module-range.js +21 -2
- package/services/commands/module-range.js.map +1 -1
- package/services/commands/package-smoke.js +53 -11
- package/services/commands/package-smoke.js.map +1 -1
- package/services/commands/package.js +23 -3
- package/services/commands/package.js.map +1 -1
- package/services/commands/release-assets.js +1 -1
- package/services/commands/release-assets.js.map +1 -1
- package/services/commands/release-check.js +18 -8
- package/services/commands/release-check.js.map +1 -1
- package/services/commands/release-publish.js +3 -3
- package/services/commands/release-publish.js.map +1 -1
- package/services/desktop/electron-binary.js +6 -2
- package/services/desktop/electron-binary.js.map +1 -1
- package/services/modules/module-artifacts.js +5 -1
- package/services/modules/module-artifacts.js.map +1 -1
- package/services/modules/module-catalog.js +19 -1
- package/services/modules/module-catalog.js.map +1 -1
- package/services/modules/module-web-views.js +18 -12
- package/services/modules/module-web-views.js.map +1 -1
- package/services/packages/addon-builder.js +7 -2
- package/services/packages/addon-builder.js.map +1 -1
- package/services/packages/package-naming.js +3 -0
- package/services/packages/package-naming.js.map +1 -1
- package/services/packaging/package-configuration.js +6 -3
- package/services/packaging/package-configuration.js.map +1 -1
- package/services/packaging/package-installer.js +2 -2
- package/services/packaging/package-installer.js.map +1 -1
- package/services/packaging/package-stage.js +15 -6
- package/services/packaging/package-stage.js.map +1 -1
- package/services/packaging/packaged-architecture.js +34 -11
- package/services/packaging/packaged-architecture.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/services/release/release-file-set.js +12 -10
- package/services/release/release-file-set.js.map +1 -1
- package/services/release/release-notes.js +9 -6
- package/services/release/release-notes.js.map +1 -1
- package/services/release/release-publisher.js +29 -21
- package/services/release/release-publisher.js.map +1 -1
package/README.md
CHANGED
|
@@ -44,7 +44,7 @@ The whole app, its build included, uses one TypeScript, the version the package
|
|
|
44
44
|
| `package [--signed] [--update-feed <URL>]` | Packages the app for the machine's own platform and processor; `--signed` signs it with the credentials in the environment. |
|
|
45
45
|
| `package-smoke [--remove-leftover \| --require-sandbox \| --no-sandbox]` | On Windows first removes what an earlier run left installed, its install folder and its command's entry on the user's Path, then installs the package just made, checks that its cookie encryption is on exactly when a module declares web views and that its product file's Windows publisher is `WINDOWS_PUBLISHER`, or none when that is not set, starts it on data and device folders of its own, and checks its build, its version, its command and that it quits. With `--remove-leftover` it only removes such a leftover, for a step that runs after a failed or cancelled smoke. On Linux it also checks Chromium's sandbox in the started app's processes: on, with every renderer under a seccomp filter, where the AppImage launcher's probe `unshare -Ur true` succeeds, and off, with `--no-sandbox`, where it fails; `--require-sandbox` skips the probe and requires the sandbox on in the started app's processes, and `--no-sandbox` starts the app without the sandbox and requires it off. |
|
|
46
46
|
| `list-targets [<app folder>]` | Prints the release's targets and the runners each builds on, from the organization's variables; with the app's folder, only the x64 targets it builds, Linux and Windows x64 and those its `desktop.supportedTargets` lists, or every x64 target when it has no such field. |
|
|
47
|
-
| `release-check` | Checks that a release may start: its version is the root manifest's and newer than every release, and its revision is on `main` with a passing Build and test run; it says which platforms the release signs. |
|
|
47
|
+
| `release-check` | Checks that a release may start: its version is the root manifest's and newer than every release, and its revision is on `main` with a passing Build and test run; it says which platforms the release signs. With `RELEASE_SOURCE_REPOSITORY` naming another repository than `RELEASE_REPOSITORY`, it reads the revision there and the releases under `RELEASE_TAG_PREFIX` alone. With `RELEASE_BUILD_REPOSITORY` naming the repository running the release, another than the source, it first requires the source to be public. |
|
|
48
48
|
| `release-assets [--update-feed <URL>]` | Collects a target's packages, checksums and update information for the release; with `--update-feed`, an HTTPS URL or a loopback HTTP URL ending in `/`, for packages that check that feed, in a test of updating or for the internal update feed. |
|
|
49
49
|
| `release-publish` | Publishes the release with the files its run built and checked; with `RELEASE_UPDATE_FEED` set, for a test of updating, it publishes nothing, and with `RELEASE_INTERNAL_VERSION` set, for the internal update feed, it checks the files for that version and publishes nothing. |
|
|
50
50
|
|
package/api/index.d.ts
CHANGED
|
@@ -33,6 +33,7 @@ export class ModuleDeclaration {
|
|
|
33
33
|
optionalDependencyVersions;
|
|
34
34
|
packageName;
|
|
35
35
|
contributions;
|
|
36
|
+
formerNames;
|
|
36
37
|
menus;
|
|
37
38
|
settings;
|
|
38
39
|
settingsPages;
|
|
@@ -44,7 +45,7 @@ export class ModuleDeclaration {
|
|
|
44
45
|
noldovaDesktop;
|
|
45
46
|
isFixture;
|
|
46
47
|
modulesPrefix;
|
|
47
|
-
constructor(folder, id, version, displayName, description, parts, dependencyVersions, optionalDependencyVersions, packageName, contributions, menus, settings, cliCommands, webViews, usesPseudoTerminals, switchSetting, platforms, noldovaDesktop, isFixture, modulesPrefix = Resources.modulesPrefix) {
|
|
48
|
+
constructor(folder, id, version, displayName, description, parts, dependencyVersions, optionalDependencyVersions, packageName, contributions, menus, settings, cliCommands, webViews, usesPseudoTerminals, switchSetting, platforms, noldovaDesktop, formerNames, isFixture, modulesPrefix = Resources.modulesPrefix) {
|
|
48
49
|
this.folder = folder;
|
|
49
50
|
this.id = id;
|
|
50
51
|
this.version = version;
|
|
@@ -57,6 +58,7 @@ export class ModuleDeclaration {
|
|
|
57
58
|
this.optionalDependencyVersions = optionalDependencyVersions;
|
|
58
59
|
this.packageName = packageName;
|
|
59
60
|
this.contributions = contributions;
|
|
61
|
+
this.formerNames = formerNames;
|
|
60
62
|
this.menus = menus;
|
|
61
63
|
this.settings = settings.settings;
|
|
62
64
|
this.settingsPages = settings.pages;
|
|
@@ -124,10 +126,16 @@ export class ModuleDeclaration {
|
|
|
124
126
|
throw fail(Resources.moduleContributesNotObject);
|
|
125
127
|
const contributions = new Map();
|
|
126
128
|
for (const [kind, names] of Object.entries(contributes)) {
|
|
129
|
+
if (kind === Resources.formerNamesField)
|
|
130
|
+
continue;
|
|
127
131
|
if (!Resources.moduleContributionKinds.includes(kind))
|
|
128
132
|
throw fail(Resources.formatModuleUnknownKind(kind));
|
|
129
133
|
contributions.set(kind, ModuleDeclaration.readNames(names, id, fail, kind));
|
|
130
134
|
}
|
|
135
|
+
const contributed = new Map(Object.entries(contributes));
|
|
136
|
+
const formerNames = contributed.has(Resources.formerNamesField)
|
|
137
|
+
? ModuleDeclaration.readFormerNames(contributed.get(Resources.formerNamesField), contributions, fail)
|
|
138
|
+
: new Map();
|
|
131
139
|
const placeholders = contributions.get(Resources.placeholdersKind) ?? [];
|
|
132
140
|
if (placeholders.length > 1)
|
|
133
141
|
throw fail(Resources.modulePlaceholderRepeated);
|
|
@@ -151,7 +159,7 @@ export class ModuleDeclaration {
|
|
|
151
159
|
const switchSetting = record.has(Resources.switchSettingField) ? ModuleDeclaration.readSwitchSetting(record.get(Resources.switchSettingField), settings.settings, fail) : null;
|
|
152
160
|
const platforms = record.has(Resources.platformsField) ? ModuleDeclaration.readPlatforms(record.get(Resources.platformsField), fail) : null;
|
|
153
161
|
const noldovaDesktop = record.has(Resources.noldovaDesktopField) ? ModuleDeclaration.readNoldovaDesktop(record.get(Resources.noldovaDesktopField), fail) : null;
|
|
154
|
-
return new ModuleDeclaration(folder, id, version, displayName, description, parts, dependencyVersions, optionalDependencyVersions, packageName, contributions, menus, settings, cliCommands, webViews, usesPseudoTerminals, switchSetting, platforms, noldovaDesktop, isFixture, await RootManifest.readModulePackagePrefixAsync(root));
|
|
162
|
+
return new ModuleDeclaration(folder, id, version, displayName, description, parts, dependencyVersions, optionalDependencyVersions, packageName, contributions, menus, settings, cliCommands, webViews, usesPseudoTerminals, switchSetting, platforms, noldovaDesktop, formerNames, isFixture, await RootManifest.readModulePackagePrefixAsync(root));
|
|
155
163
|
}
|
|
156
164
|
get file() {
|
|
157
165
|
return Resources.formatFolderFile(this.folder, Resources.moduleDeclarationFileName);
|
|
@@ -178,6 +186,7 @@ export class ModuleDeclaration {
|
|
|
178
186
|
runtimePackage: this.runtimePackage,
|
|
179
187
|
cliPackage: this.cliPackage,
|
|
180
188
|
contributes: Object.fromEntries([...this.contributions].map(([kind, names]) => [kind, [...names]])),
|
|
189
|
+
...this.formerNames.size === 0 ? {} : { formerNames: Object.fromEntries([...this.formerNames].map(([name, formers]) => [name, [...formers]])) },
|
|
181
190
|
settings: [...this.settings],
|
|
182
191
|
cliCommands: [...this.cliCommands],
|
|
183
192
|
...Object.isNull(this.webViews) ? {} : { webViews: this.webViews },
|
|
@@ -259,6 +268,24 @@ export class ModuleDeclaration {
|
|
|
259
268
|
throw fail(Resources.formatModuleNamesInvalid(kind, id));
|
|
260
269
|
return value.map(t => String(t));
|
|
261
270
|
}
|
|
271
|
+
static readFormerNames(value, contributions, fail) {
|
|
272
|
+
if (!Object.isPlainObject(value))
|
|
273
|
+
throw fail(Resources.moduleFormerNamesNotObject);
|
|
274
|
+
const renamed = [...contributions.get(Resources.commandsKind) ?? [], ...contributions.get(Resources.documentsKind) ?? []];
|
|
275
|
+
const formerNames = new Map();
|
|
276
|
+
for (const [name, formers] of Object.entries(value)) {
|
|
277
|
+
if (!renamed.includes(name))
|
|
278
|
+
throw fail(Resources.formatModuleFormerNamesUndeclared(name));
|
|
279
|
+
if (!Array.isArray(formers) || formers.length === 0 || new Set(formers).size < formers.length
|
|
280
|
+
|| !formers.every(t => Object.isString(t) && t !== name && Resources.qualifiedNamePattern.test(t)))
|
|
281
|
+
throw fail(Resources.formatModuleFormerNamesInvalid(name));
|
|
282
|
+
const reserved = formers.map(t => String(t)).find(t => Resources.moduleReservedIds.includes(t.slice(0, t.indexOf("."))));
|
|
283
|
+
if (!Object.isUndefined(reserved))
|
|
284
|
+
throw fail(Resources.formatModuleFormerNamesReserved(name, reserved));
|
|
285
|
+
formerNames.set(name, formers.map(t => String(t)));
|
|
286
|
+
}
|
|
287
|
+
return formerNames;
|
|
288
|
+
}
|
|
262
289
|
static readToolNames(value, id, fail) {
|
|
263
290
|
const prefixes = Resources.formatModuleToolPrefixes(id);
|
|
264
291
|
const isOwned = (name) => Resources.moduleToolPattern.test(name) && prefixes.some(t => name.startsWith(t) && name.length > t.length);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-declaration.js","sourceRoot":"","sources":["../../../../../src/noldova.desktop.build/src/models/modules/module-declaration.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"module-declaration.js","sourceRoot":"","sources":["../../../../../src/noldova.desktop.build/src/models/modules/module-declaration.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,9 @@ export class WebViewKeys {
|
|
|
24
24
|
const tokens = form.split(Resources.keyChordSeparator);
|
|
25
25
|
return !tokens.some(t => t === Resources.modKey || t === Resources.ctrlKey || t === Resources.altKey) && !Resources.functionKeyPattern.test(String(tokens.at(-1)));
|
|
26
26
|
}
|
|
27
|
+
static isEscape(form) {
|
|
28
|
+
return form.split(Resources.keyChordSeparator).at(-1) === Resources.escapeKey;
|
|
29
|
+
}
|
|
27
30
|
static refusedOn(isMac) {
|
|
28
31
|
return [
|
|
29
32
|
...Resources.webViewEditingKeys,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-view-keys.js","sourceRoot":"","sources":["../../../../../src/noldova.desktop.build/src/models/modules/web-view-keys.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"web-view-keys.js","sourceRoot":"","sources":["../../../../../src/noldova.desktop.build/src/models/modules/web-view-keys.ts"],"names":[],"mappings":"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"}
|
|
@@ -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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"}
|
|
@@ -5,7 +5,8 @@
|
|
|
5
5
|
* This source code is licensed under the license found in the
|
|
6
6
|
* LICENSE file in the root directory of this source tree.
|
|
7
7
|
*/
|
|
8
|
-
import {
|
|
8
|
+
import { existsSync } from "node:fs";
|
|
9
|
+
import { cp, mkdir, readFile, realpath, writeFile } from "node:fs/promises";
|
|
9
10
|
import path from "node:path";
|
|
10
11
|
import "@noldova/context.core";
|
|
11
12
|
import { ExceptionOptions } from "@noldova/context.exceptions";
|
|
@@ -34,7 +35,7 @@ export class CompanyPackage {
|
|
|
34
35
|
throw new BuildException(Resources.formatCompanyPackageMismatch(locked.location, locked.id));
|
|
35
36
|
const dependencies = manifest[Resources.manifestDependenciesField];
|
|
36
37
|
const bundled = Object.keys(Object.isPlainObject(dependencies) ? dependencies : {}).filter(t => windowPackages.has(t));
|
|
37
|
-
const archive = locked.
|
|
38
|
+
const archive = locked.isArchive ? await CompanyPackage.verifyArchiveAsync(locked, root) : null;
|
|
38
39
|
if (!Object.isNull(archive) && bundled.length === 0)
|
|
39
40
|
return new CompanyPackage(locked, archive[0]);
|
|
40
41
|
await mkdir(folder, { recursive: true });
|
|
@@ -56,17 +57,33 @@ export class CompanyPackage {
|
|
|
56
57
|
}
|
|
57
58
|
static async verifyArchiveAsync(locked, root) {
|
|
58
59
|
const archive = locked.locateArchive(root);
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
60
|
+
const repository = CompanyPackage.findRepository(path.resolve(root));
|
|
61
|
+
const relative = path.relative(repository, archive);
|
|
62
|
+
if (!locked.isInstalled && (path.isAbsolute(relative) || relative.split(path.sep)[0] === Resources.parentFolderSegment))
|
|
63
|
+
throw new BuildException(Resources.formatLockedArchiveOutside(locked.id, archive, repository));
|
|
64
|
+
const unreadable = (error) => {
|
|
64
65
|
throw new BuildException(Resources.formatCompanyArchiveUnreadable(locked.id, archive), new ExceptionOptions(error));
|
|
66
|
+
};
|
|
67
|
+
if (!locked.isInstalled) {
|
|
68
|
+
const real = await realpath(archive).catch(unreadable);
|
|
69
|
+
if (real !== path.join(await realpath(repository), relative))
|
|
70
|
+
throw new BuildException(Resources.formatLockedArchiveThroughLink(locked.id, archive, real));
|
|
65
71
|
}
|
|
66
|
-
|
|
72
|
+
const data = await readFile(archive).catch(unreadable);
|
|
73
|
+
if (!Object.isNull(locked.sha512) && !locked.matches(data))
|
|
67
74
|
throw new BuildException(Resources.formatCompanyArchiveMismatch(archive, locked.id));
|
|
68
75
|
return [archive, data];
|
|
69
76
|
}
|
|
77
|
+
static findRepository(root) {
|
|
78
|
+
let folder = root;
|
|
79
|
+
while (!existsSync(path.join(folder, Resources.gitFolder))) {
|
|
80
|
+
const parent = path.dirname(folder);
|
|
81
|
+
if (parent === folder)
|
|
82
|
+
return root;
|
|
83
|
+
folder = parent;
|
|
84
|
+
}
|
|
85
|
+
return folder;
|
|
86
|
+
}
|
|
70
87
|
static async extractAsync(locked, [archive, data], source) {
|
|
71
88
|
const written = new Map();
|
|
72
89
|
for (const entry of TarArchive.fromGzip(data, archive).entries) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"company-package.js","sourceRoot":"","sources":["../../../../../src/noldova.desktop.build/src/models/packaging/company-package.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"company-package.js","sourceRoot":"","sources":["../../../../../src/noldova.desktop.build/src/models/packaging/company-package.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,8 @@ import path from "node:path";
|
|
|
10
10
|
import "@noldova/context.core";
|
|
11
11
|
import { BuildException } from "../../exceptions/build.exception.js";
|
|
12
12
|
import { Resources } from "../../resources.js";
|
|
13
|
+
import { BuildLayout } from "../../services/packages/build-layout.js";
|
|
14
|
+
import { PackageNaming } from "../../services/packages/package-naming.js";
|
|
13
15
|
export class LockedPackage {
|
|
14
16
|
location;
|
|
15
17
|
name;
|
|
@@ -22,12 +24,21 @@ export class LockedPackage {
|
|
|
22
24
|
const version = entry[Resources.manifestVersionField];
|
|
23
25
|
const resolved = entry[Resources.lockResolvedField];
|
|
24
26
|
const integrity = entry[Resources.lockIntegrityField];
|
|
27
|
+
if (entry[Resources.lockLinkField] === true)
|
|
28
|
+
throw new BuildException(Resources.formatLockedPackageLinked(location, String(resolved)));
|
|
25
29
|
if (!Resources.lockedPackageName.test(name) || !Object.isString(version) || !Resources.lockedPackageVersion.test(version))
|
|
26
30
|
throw new BuildException(Resources.formatLockedPackageInvalid(location));
|
|
27
31
|
if (entry[Resources.lockInBundleField] === true)
|
|
28
32
|
throw new BuildException(Resources.formatLockedPackageBundled(name, version, location));
|
|
29
33
|
if (!Object.isUndefined(entry[Resources.manifestNameField]) && entry[Resources.manifestNameField] !== name)
|
|
30
34
|
throw new BuildException(Resources.formatLockedPackageAlias(location, String(entry[Resources.manifestNameField]), name));
|
|
35
|
+
if (!isInstalled && Object.isString(resolved) && resolved.startsWith(Resources.archiveScheme)) {
|
|
36
|
+
if (!LockedPackage.isOwnArchive(name, resolved))
|
|
37
|
+
throw new BuildException(Resources.formatLockedArchiveRefused(name, version, location, resolved));
|
|
38
|
+
const expected = BuildLayout.nameArchive(name, version);
|
|
39
|
+
if (path.posix.basename(resolved) !== expected)
|
|
40
|
+
throw new BuildException(Resources.formatLockedArchiveMisnamed(name, version, location, resolved, expected));
|
|
41
|
+
}
|
|
31
42
|
if (!Object.isString(resolved) || !LockedPackage.isShippable(resolved, isInstalled))
|
|
32
43
|
throw new BuildException(isInstalled
|
|
33
44
|
? Resources.formatLockedPackageUnlocked(name, version, location)
|
|
@@ -35,13 +46,16 @@ export class LockedPackage {
|
|
|
35
46
|
const sha512 = Object.isString(integrity)
|
|
36
47
|
? integrity.split(Resources.integritySeparator).find(t => t.startsWith(Resources.integrityPrefix))?.slice(Resources.integrityPrefix.length)
|
|
37
48
|
: undefined;
|
|
38
|
-
|
|
39
|
-
|
|
49
|
+
const isOwnArchive = !isInstalled && resolved.startsWith(Resources.archiveScheme);
|
|
50
|
+
if (Object.isUndefined(sha512) && !(isOwnArchive && Object.isUndefined(integrity)))
|
|
51
|
+
throw new BuildException(isOwnArchive
|
|
52
|
+
? Resources.formatLockedArchiveNoIntegrity(name, version, location, resolved)
|
|
53
|
+
: Resources.formatLockedPackageNoIntegrity(name, version, location));
|
|
40
54
|
this.location = location;
|
|
41
55
|
this.name = name;
|
|
42
56
|
this.version = version;
|
|
43
57
|
this.resolved = resolved;
|
|
44
|
-
this.sha512 = sha512;
|
|
58
|
+
this.sha512 = sha512 ?? null;
|
|
45
59
|
this.isInstalled = isInstalled;
|
|
46
60
|
}
|
|
47
61
|
get id() {
|
|
@@ -50,6 +64,9 @@ export class LockedPackage {
|
|
|
50
64
|
get fileName() {
|
|
51
65
|
return Resources.formatLockedArchiveName(this.name, this.version);
|
|
52
66
|
}
|
|
67
|
+
get isArchive() {
|
|
68
|
+
return this.resolved.startsWith(Resources.archiveScheme);
|
|
69
|
+
}
|
|
53
70
|
locateArchive(root) {
|
|
54
71
|
return path.resolve(root, this.resolved.slice(Resources.archiveScheme.length));
|
|
55
72
|
}
|
|
@@ -57,9 +74,14 @@ export class LockedPackage {
|
|
|
57
74
|
return createHash(Resources.integrityAlgorithm).update(data).digest(Resources.integrityDigestEncoding) === this.sha512;
|
|
58
75
|
}
|
|
59
76
|
static isShippable(resolved, isInstalled) {
|
|
60
|
-
if (
|
|
61
|
-
return
|
|
62
|
-
return URL.canParse(resolved) && Resources.registrySchemes.includes(new URL(resolved).protocol);
|
|
77
|
+
if (resolved.startsWith(Resources.archiveScheme))
|
|
78
|
+
return true;
|
|
79
|
+
return !isInstalled && URL.canParse(resolved) && Resources.registrySchemes.includes(new URL(resolved).protocol);
|
|
80
|
+
}
|
|
81
|
+
static isOwnArchive(name, resolved) {
|
|
82
|
+
const file = resolved.slice(Resources.archiveScheme.length);
|
|
83
|
+
return PackageNaming.isNoldova(name) && file === path.posix.normalize(file) && Resources.ownArchiveFolder.test(path.posix.dirname(file))
|
|
84
|
+
&& path.posix.extname(file) === Resources.packageArchiveExtension;
|
|
63
85
|
}
|
|
64
86
|
}
|
|
65
87
|
//# sourceMappingURL=locked-package.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locked-package.js","sourceRoot":"","sources":["../../../../../src/noldova.desktop.build/src/models/packaging/locked-package.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"locked-package.js","sourceRoot":"","sources":["../../../../../src/noldova.desktop.build/src/models/packaging/locked-package.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,10 @@ export class PackageTarget {
|
|
|
31
31
|
static fromProcess(platform, architecture) {
|
|
32
32
|
return new PackageTarget(Resources.packagePlatforms.get(platform) ?? platform, architecture);
|
|
33
33
|
}
|
|
34
|
+
static readArchitecture(environment, processArchitecture) {
|
|
35
|
+
const architecture = environment[Resources.targetArchitectureVariable] ?? String.empty;
|
|
36
|
+
return architecture.length > 0 ? architecture : processArchitecture;
|
|
37
|
+
}
|
|
34
38
|
get id() {
|
|
35
39
|
return Resources.formatTargetId(this.platform, this.architecture);
|
|
36
40
|
}
|
|
@@ -40,11 +44,11 @@ export class PackageTarget {
|
|
|
40
44
|
static listAll() {
|
|
41
45
|
return [...Resources.packageFormats.keys()].flatMap(t => Resources.packageArchitectures.map(u => new PackageTarget(t, u)));
|
|
42
46
|
}
|
|
43
|
-
formatFileName(productName, extension) {
|
|
44
|
-
return Resources.formatTargetFileName(productName, this.platform, this.architecture, extension);
|
|
47
|
+
formatFileName(productName, version, extension) {
|
|
48
|
+
return Resources.formatTargetFileName(productName, version, this.platform, this.architecture, extension);
|
|
45
49
|
}
|
|
46
|
-
listFileNames(productName) {
|
|
47
|
-
return this.extensions.map(t => this.formatFileName(productName, t));
|
|
50
|
+
listFileNames(productName, version) {
|
|
51
|
+
return this.extensions.map(t => this.formatFileName(productName, version, t));
|
|
48
52
|
}
|
|
49
53
|
}
|
|
50
54
|
//# sourceMappingURL=package-target.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-target.js","sourceRoot":"","sources":["../../../../../src/noldova.desktop.build/src/models/packaging/package-target.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,MAAM,OAAO,aAAa;IACP,aAAa,CAAS;IAEvB,QAAQ,CAAS;IACjB,YAAY,CAAS;IACrB,OAAO,CAAoB;IAC3B,UAAU,CAAoB;IAC9B,eAAe,CAAS;IAExC,YAAmB,QAAgB,EAAE,YAAoB;QACvD,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,eAAe,GAAG,SAAS,CAAC,uBAAuB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxE,MAAM,aAAa,GAAG,CAAC,GAAG,SAAS,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACjG,IAAI,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,QAAQ,CAAC,YAAY,CAAC;YACnK,MAAM,IAAI,cAAc,CAAC,SAAS,CAAC,8BAA8B,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;QAE7F,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,UAAU,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QACxC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,QAAgB,EAAE,YAAoB;QAC9D,OAAO,IAAI,aAAa,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,QAAQ,EAAE,YAAY,CAAC,CAAC;IAC/F,CAAC;IAED,IAAW,EAAE;QACX,OAAO,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACpE,CAAC;IAED,IAAW,WAAW;QACpB,OAAO,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACzE,CAAC;IAEM,MAAM,CAAC,OAAO;QACnB,OAAO,CAAC,GAAG,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7H,CAAC;IAEM,cAAc,CAAC,WAAmB,EAAE,SAAiB;
|
|
1
|
+
{"version":3,"file":"package-target.js","sourceRoot":"","sources":["../../../../../src/noldova.desktop.build/src/models/packaging/package-target.ts"],"names":[],"mappings":"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"}
|