@basemaps/lambda-tiler 7.14.0 → 7.15.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/dist/index.js +221 -20
- package/dist/node_modules/.package-lock.json +4 -4
- package/dist/node_modules/semver/README.md +14 -4
- package/dist/node_modules/semver/bin/semver.js +2 -1
- package/dist/node_modules/semver/classes/semver.js +22 -6
- package/dist/node_modules/semver/functions/diff.js +5 -12
- package/dist/node_modules/semver/internal/re.js +2 -0
- package/dist/node_modules/semver/package.json +8 -7
- package/dist/package-lock.json +5 -5
- package/dist/package.json +1 -1
- package/package.json +9 -9
- package/tsconfig.tsbuildinfo +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,14 @@
|
|
|
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
|
+
# [7.15.0](https://github.com/linz/basemaps/compare/v7.14.0...v7.15.0) (2025-03-17)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @basemaps/lambda-tiler
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
6
14
|
# [7.14.0](https://github.com/linz/basemaps/compare/v7.13.0...v7.14.0) (2025-01-26)
|
|
7
15
|
|
|
8
16
|
**Note:** Version bump only for package @basemaps/lambda-tiler
|
package/dist/index.js
CHANGED
|
@@ -77377,9 +77377,16 @@ credentials.onFileSystemFound = (acc, fs4, path2) => {
|
|
|
77377
77377
|
applyS3MiddleWare(fs4);
|
|
77378
77378
|
fsa.register(acc.prefix, fs4);
|
|
77379
77379
|
};
|
|
77380
|
+
function splitConfig(x) {
|
|
77381
|
+
if (x.startsWith("["))
|
|
77382
|
+
return JSON.parse(x);
|
|
77383
|
+
return x.split(",");
|
|
77384
|
+
}
|
|
77380
77385
|
var credentialPath = Env.get(Env.AwsRoleConfigPath);
|
|
77381
|
-
if (credentialPath)
|
|
77382
|
-
|
|
77386
|
+
if (credentialPath) {
|
|
77387
|
+
for (const loc of splitConfig(credentialPath))
|
|
77388
|
+
credentials.registerConfig(fsa.toUrl(loc), s3Fs);
|
|
77389
|
+
}
|
|
77383
77390
|
s3Fs.credentials = credentials;
|
|
77384
77391
|
fsa.register("https://", new FsHttp());
|
|
77385
77392
|
fsa.register("s3://", s3Fs);
|
|
@@ -78417,16 +78424,11 @@ var CHAR_2 = "2".charCodeAt(0);
|
|
|
78417
78424
|
var CHAR_3 = "3".charCodeAt(0);
|
|
78418
78425
|
|
|
78419
78426
|
// ../geo/build/xy.order.js
|
|
78420
|
-
var XyOrder;
|
|
78421
|
-
(function(XyOrder2) {
|
|
78422
|
-
XyOrder2[XyOrder2["Xy"] = 0] = "Xy";
|
|
78423
|
-
XyOrder2[XyOrder2["Yx"] = 1] = "Yx";
|
|
78424
|
-
})(XyOrder || (XyOrder = {}));
|
|
78425
78427
|
function getXyOrder(epsg) {
|
|
78426
|
-
|
|
78427
|
-
|
|
78428
|
-
|
|
78429
|
-
return
|
|
78428
|
+
const code = typeof epsg === "number" ? epsg : epsg.code;
|
|
78429
|
+
if (code === EpsgCode.Nztm2000 || code === EpsgCode.Citm2000)
|
|
78430
|
+
return "yx";
|
|
78431
|
+
return "xy";
|
|
78430
78432
|
}
|
|
78431
78433
|
|
|
78432
78434
|
// ../geo/build/tile.matrix.set.js
|
|
@@ -78506,7 +78508,7 @@ var TileMatrixSet = class {
|
|
|
78506
78508
|
if (projection == null)
|
|
78507
78509
|
throw new Error(`Unable to find supported projection ${def.supportedCRS}`);
|
|
78508
78510
|
this.projection = projection;
|
|
78509
|
-
if (getXyOrder(this.projection) ===
|
|
78511
|
+
if (getXyOrder(this.projection) === "yx") {
|
|
78510
78512
|
this.indexX = 1;
|
|
78511
78513
|
this.indexY = 0;
|
|
78512
78514
|
}
|
|
@@ -78706,6 +78708,204 @@ var TileMatrixSet = class {
|
|
|
78706
78708
|
}
|
|
78707
78709
|
};
|
|
78708
78710
|
|
|
78711
|
+
// ../geo/build/tms/citm2000.js
|
|
78712
|
+
var Citm2000Tmst = {
|
|
78713
|
+
type: "TileMatrixSetType",
|
|
78714
|
+
title: "Debug tile matrix for EPSG:3793",
|
|
78715
|
+
abstract: "",
|
|
78716
|
+
identifier: "CITM2000Quad",
|
|
78717
|
+
supportedCRS: "https://www.opengis.net/def/crs/EPSG/0/3793",
|
|
78718
|
+
boundingBox: {
|
|
78719
|
+
type: "BoundingBoxType",
|
|
78720
|
+
crs: "https://www.opengis.net/def/crs/EPSG/0/3793",
|
|
78721
|
+
lowerCorner: [5051234111622438e-9, 3.4301543757978342e6],
|
|
78722
|
+
upperCorner: [5207777145550478e-9, 3.5866974097258747e6]
|
|
78723
|
+
},
|
|
78724
|
+
tileMatrix: [
|
|
78725
|
+
{
|
|
78726
|
+
type: "TileMatrixType",
|
|
78727
|
+
identifier: "0",
|
|
78728
|
+
scaleDenominator: 218391509386217e-8,
|
|
78729
|
+
topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
|
|
78730
|
+
tileWidth: 256,
|
|
78731
|
+
tileHeight: 256,
|
|
78732
|
+
matrixWidth: 1,
|
|
78733
|
+
matrixHeight: 1
|
|
78734
|
+
},
|
|
78735
|
+
{
|
|
78736
|
+
type: "TileMatrixType",
|
|
78737
|
+
identifier: "1",
|
|
78738
|
+
scaleDenominator: 109195754693108e-8,
|
|
78739
|
+
topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
|
|
78740
|
+
tileWidth: 256,
|
|
78741
|
+
tileHeight: 256,
|
|
78742
|
+
matrixWidth: 2,
|
|
78743
|
+
matrixHeight: 2
|
|
78744
|
+
},
|
|
78745
|
+
{
|
|
78746
|
+
type: "TileMatrixType",
|
|
78747
|
+
identifier: "2",
|
|
78748
|
+
scaleDenominator: 545978.773465544,
|
|
78749
|
+
topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
|
|
78750
|
+
tileWidth: 256,
|
|
78751
|
+
tileHeight: 256,
|
|
78752
|
+
matrixWidth: 4,
|
|
78753
|
+
matrixHeight: 4
|
|
78754
|
+
},
|
|
78755
|
+
{
|
|
78756
|
+
type: "TileMatrixType",
|
|
78757
|
+
identifier: "3",
|
|
78758
|
+
scaleDenominator: 272989.386732772,
|
|
78759
|
+
topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
|
|
78760
|
+
tileWidth: 256,
|
|
78761
|
+
tileHeight: 256,
|
|
78762
|
+
matrixWidth: 8,
|
|
78763
|
+
matrixHeight: 8
|
|
78764
|
+
},
|
|
78765
|
+
{
|
|
78766
|
+
type: "TileMatrixType",
|
|
78767
|
+
identifier: "4",
|
|
78768
|
+
scaleDenominator: 136494.693366386,
|
|
78769
|
+
topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
|
|
78770
|
+
tileWidth: 256,
|
|
78771
|
+
tileHeight: 256,
|
|
78772
|
+
matrixWidth: 16,
|
|
78773
|
+
matrixHeight: 16
|
|
78774
|
+
},
|
|
78775
|
+
{
|
|
78776
|
+
type: "TileMatrixType",
|
|
78777
|
+
identifier: "5",
|
|
78778
|
+
scaleDenominator: 68247.346683193,
|
|
78779
|
+
topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
|
|
78780
|
+
tileWidth: 256,
|
|
78781
|
+
tileHeight: 256,
|
|
78782
|
+
matrixWidth: 32,
|
|
78783
|
+
matrixHeight: 32
|
|
78784
|
+
},
|
|
78785
|
+
{
|
|
78786
|
+
type: "TileMatrixType",
|
|
78787
|
+
identifier: "6",
|
|
78788
|
+
scaleDenominator: 34123.6733415964,
|
|
78789
|
+
topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
|
|
78790
|
+
tileWidth: 256,
|
|
78791
|
+
tileHeight: 256,
|
|
78792
|
+
matrixWidth: 64,
|
|
78793
|
+
matrixHeight: 64
|
|
78794
|
+
},
|
|
78795
|
+
{
|
|
78796
|
+
type: "TileMatrixType",
|
|
78797
|
+
identifier: "7",
|
|
78798
|
+
scaleDenominator: 17061.8366707982,
|
|
78799
|
+
topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
|
|
78800
|
+
tileWidth: 256,
|
|
78801
|
+
tileHeight: 256,
|
|
78802
|
+
matrixWidth: 128,
|
|
78803
|
+
matrixHeight: 128
|
|
78804
|
+
},
|
|
78805
|
+
{
|
|
78806
|
+
type: "TileMatrixType",
|
|
78807
|
+
identifier: "8",
|
|
78808
|
+
scaleDenominator: 8530.91833539913,
|
|
78809
|
+
topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
|
|
78810
|
+
tileWidth: 256,
|
|
78811
|
+
tileHeight: 256,
|
|
78812
|
+
matrixWidth: 256,
|
|
78813
|
+
matrixHeight: 256
|
|
78814
|
+
},
|
|
78815
|
+
{
|
|
78816
|
+
type: "TileMatrixType",
|
|
78817
|
+
identifier: "9",
|
|
78818
|
+
scaleDenominator: 4265.45916769956,
|
|
78819
|
+
topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
|
|
78820
|
+
tileWidth: 256,
|
|
78821
|
+
tileHeight: 256,
|
|
78822
|
+
matrixWidth: 512,
|
|
78823
|
+
matrixHeight: 512
|
|
78824
|
+
},
|
|
78825
|
+
{
|
|
78826
|
+
type: "TileMatrixType",
|
|
78827
|
+
identifier: "10",
|
|
78828
|
+
scaleDenominator: 2132.72958384978,
|
|
78829
|
+
topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
|
|
78830
|
+
tileWidth: 256,
|
|
78831
|
+
tileHeight: 256,
|
|
78832
|
+
matrixWidth: 1024,
|
|
78833
|
+
matrixHeight: 1024
|
|
78834
|
+
},
|
|
78835
|
+
{
|
|
78836
|
+
type: "TileMatrixType",
|
|
78837
|
+
identifier: "11",
|
|
78838
|
+
scaleDenominator: 1066.36479192489,
|
|
78839
|
+
topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
|
|
78840
|
+
tileWidth: 256,
|
|
78841
|
+
tileHeight: 256,
|
|
78842
|
+
matrixWidth: 2048,
|
|
78843
|
+
matrixHeight: 2048
|
|
78844
|
+
},
|
|
78845
|
+
{
|
|
78846
|
+
type: "TileMatrixType",
|
|
78847
|
+
identifier: "12",
|
|
78848
|
+
scaleDenominator: 533.182395962445,
|
|
78849
|
+
topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
|
|
78850
|
+
tileWidth: 256,
|
|
78851
|
+
tileHeight: 256,
|
|
78852
|
+
matrixWidth: 4096,
|
|
78853
|
+
matrixHeight: 4096
|
|
78854
|
+
},
|
|
78855
|
+
{
|
|
78856
|
+
type: "TileMatrixType",
|
|
78857
|
+
identifier: "13",
|
|
78858
|
+
scaleDenominator: 266.591197981222,
|
|
78859
|
+
topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
|
|
78860
|
+
tileWidth: 256,
|
|
78861
|
+
tileHeight: 256,
|
|
78862
|
+
matrixWidth: 8192,
|
|
78863
|
+
matrixHeight: 8192
|
|
78864
|
+
},
|
|
78865
|
+
{
|
|
78866
|
+
type: "TileMatrixType",
|
|
78867
|
+
identifier: "14",
|
|
78868
|
+
scaleDenominator: 133.295598990611,
|
|
78869
|
+
topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
|
|
78870
|
+
tileWidth: 256,
|
|
78871
|
+
tileHeight: 256,
|
|
78872
|
+
matrixWidth: 16384,
|
|
78873
|
+
matrixHeight: 16384
|
|
78874
|
+
},
|
|
78875
|
+
{
|
|
78876
|
+
type: "TileMatrixType",
|
|
78877
|
+
identifier: "15",
|
|
78878
|
+
scaleDenominator: 66.6477994953056,
|
|
78879
|
+
topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
|
|
78880
|
+
tileWidth: 256,
|
|
78881
|
+
tileHeight: 256,
|
|
78882
|
+
matrixWidth: 32768,
|
|
78883
|
+
matrixHeight: 32768
|
|
78884
|
+
},
|
|
78885
|
+
{
|
|
78886
|
+
type: "TileMatrixType",
|
|
78887
|
+
identifier: "16",
|
|
78888
|
+
scaleDenominator: 33.3238997476528,
|
|
78889
|
+
topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
|
|
78890
|
+
tileWidth: 256,
|
|
78891
|
+
tileHeight: 256,
|
|
78892
|
+
matrixWidth: 65536,
|
|
78893
|
+
matrixHeight: 65536
|
|
78894
|
+
}
|
|
78895
|
+
],
|
|
78896
|
+
$generated: {
|
|
78897
|
+
package: "@basemaps/cli",
|
|
78898
|
+
version: "v7.14.0-4-g2766010d",
|
|
78899
|
+
hash: "2766010d8d2bb8b673f6bcbef2fe2636f2e0f4ea",
|
|
78900
|
+
createdAt: "2025-02-10T20:34:46.643Z"
|
|
78901
|
+
},
|
|
78902
|
+
$options: {
|
|
78903
|
+
sourceTileMatrix: "WebMercatorQuad",
|
|
78904
|
+
zoomOffset: 8
|
|
78905
|
+
}
|
|
78906
|
+
};
|
|
78907
|
+
var Citm2000Tms = new TileMatrixSet(Citm2000Tmst);
|
|
78908
|
+
|
|
78709
78909
|
// ../geo/build/tms/google.js
|
|
78710
78910
|
var GoogleTmst = {
|
|
78711
78911
|
type: "TileMatrixSetType",
|
|
@@ -78982,11 +79182,12 @@ var Nztm2000QuadTms = new TileMatrixSet(Nztm20002.Nztm2000Quad);
|
|
|
78982
79182
|
// ../geo/build/tms/index.js
|
|
78983
79183
|
var TileMatrixSets = {
|
|
78984
79184
|
/** All TileMatrixSets that are currently supported */
|
|
78985
|
-
All: [GoogleTms, Nztm2000Tms, Nztm2000QuadTms],
|
|
79185
|
+
All: [GoogleTms, Nztm2000Tms, Nztm2000QuadTms, Citm2000Tms],
|
|
78986
79186
|
/** Default mapping of EPSG code to Tile matrix set */
|
|
78987
79187
|
Defaults: /* @__PURE__ */ new Map([
|
|
78988
79188
|
[Epsg.Google.code, GoogleTms],
|
|
78989
|
-
[Epsg.Nztm2000.code, Nztm2000Tms]
|
|
79189
|
+
[Epsg.Nztm2000.code, Nztm2000Tms],
|
|
79190
|
+
[Epsg.Citm2000.code, Citm2000Tms]
|
|
78990
79191
|
]),
|
|
78991
79192
|
/**
|
|
78992
79193
|
* Get a tile matrix set by EPSG Code
|
|
@@ -82268,9 +82469,9 @@ var Router = class {
|
|
|
82268
82469
|
};
|
|
82269
82470
|
|
|
82270
82471
|
// ../../node_modules/@linzjs/lambda/build/src/function.js
|
|
82271
|
-
var version2 = "v7.
|
|
82272
|
-
var hash = "
|
|
82273
|
-
var buildId = "
|
|
82472
|
+
var version2 = "v7.14.0-9-ga2fa0faa";
|
|
82473
|
+
var hash = "a2fa0faa57e5591a50900fd469dbb9637b7d9c8e";
|
|
82474
|
+
var buildId = "13911363896-1";
|
|
82274
82475
|
var versionInfo = { version: version2, hash, buildId };
|
|
82275
82476
|
async function runFunction(req, fn) {
|
|
82276
82477
|
if (!req.timer.timers.has("lambda"))
|
|
@@ -86521,17 +86722,17 @@ function versionGet() {
|
|
|
86521
86722
|
* last git version tag
|
|
86522
86723
|
* @example "v6.42.1"
|
|
86523
86724
|
*/
|
|
86524
|
-
version: "v7.
|
|
86725
|
+
version: "v7.14.0-9-ga2fa0faa",
|
|
86525
86726
|
/**
|
|
86526
86727
|
* Full git commit hash
|
|
86527
86728
|
* @example "e4231b1ee62c276c8657c56677ced02681dfe5d6"
|
|
86528
86729
|
*/
|
|
86529
|
-
hash: "
|
|
86730
|
+
hash: "a2fa0faa57e5591a50900fd469dbb9637b7d9c8e",
|
|
86530
86731
|
/**
|
|
86531
86732
|
* The exact build that this release was run from
|
|
86532
86733
|
* @example "1658821493-3"
|
|
86533
86734
|
*/
|
|
86534
|
-
buildId: "
|
|
86735
|
+
buildId: "13911363896-1"
|
|
86535
86736
|
});
|
|
86536
86737
|
return Promise.resolve(response);
|
|
86537
86738
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@basemaps/lambda-tiler",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.15.0",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
@@ -115,9 +115,9 @@
|
|
|
115
115
|
"license": "Apache-2.0"
|
|
116
116
|
},
|
|
117
117
|
"node_modules/semver": {
|
|
118
|
-
"version": "7.
|
|
119
|
-
"resolved": "https://registry.npmjs.org/semver/-/semver-7.
|
|
120
|
-
"integrity": "sha512-
|
|
118
|
+
"version": "7.7.1",
|
|
119
|
+
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
|
|
120
|
+
"integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
|
|
121
121
|
"license": "ISC",
|
|
122
122
|
"bin": {
|
|
123
123
|
"semver": "bin/semver.js"
|
|
@@ -100,7 +100,7 @@ Options:
|
|
|
100
100
|
-i --increment [<level>]
|
|
101
101
|
Increment a version by the specified level. Level can
|
|
102
102
|
be one of: major, minor, patch, premajor, preminor,
|
|
103
|
-
prepatch, or
|
|
103
|
+
prepatch, prerelease, or release. Default level is 'patch'.
|
|
104
104
|
Only one version may be specified.
|
|
105
105
|
|
|
106
106
|
--preid <identifier>
|
|
@@ -141,6 +141,8 @@ A "version" is described by the `v2.0.0` specification found at
|
|
|
141
141
|
<https://semver.org/>.
|
|
142
142
|
|
|
143
143
|
A leading `"="` or `"v"` character is stripped off and ignored.
|
|
144
|
+
Support for stripping a leading "v" is kept for compatibility with `v1.0.0` of the SemVer
|
|
145
|
+
specification but should not be used anymore.
|
|
144
146
|
|
|
145
147
|
## Ranges
|
|
146
148
|
|
|
@@ -237,6 +239,13 @@ $ semver 1.2.4-beta.0 -i prerelease
|
|
|
237
239
|
1.2.4-beta.1
|
|
238
240
|
```
|
|
239
241
|
|
|
242
|
+
To get out of the prerelease phase, use the `release` option:
|
|
243
|
+
|
|
244
|
+
```bash
|
|
245
|
+
$ semver 1.2.4-beta.1 -i release
|
|
246
|
+
1.2.4
|
|
247
|
+
```
|
|
248
|
+
|
|
240
249
|
#### Prerelease Identifier Base
|
|
241
250
|
|
|
242
251
|
The method `.inc` takes an optional parameter 'identifierBase' string
|
|
@@ -415,10 +424,10 @@ Strict-mode Comparators and Ranges will be strict about the SemVer
|
|
|
415
424
|
strings that they parse.
|
|
416
425
|
|
|
417
426
|
* `valid(v)`: Return the parsed version, or null if it's not valid.
|
|
418
|
-
* `inc(v,
|
|
427
|
+
* `inc(v, releaseType, options, identifier, identifierBase)`:
|
|
419
428
|
Return the version incremented by the release
|
|
420
429
|
type (`major`, `premajor`, `minor`, `preminor`, `patch`,
|
|
421
|
-
`prepatch`, or `
|
|
430
|
+
`prepatch`, `prerelease`, or `release`), or null if it's not valid
|
|
422
431
|
* `premajor` in one call will bump the version up to the next major
|
|
423
432
|
version and down to a prerelease of that major version.
|
|
424
433
|
`preminor`, and `prepatch` work the same way.
|
|
@@ -426,6 +435,7 @@ strings that they parse.
|
|
|
426
435
|
same as `prepatch`. It increments the patch version and then makes a
|
|
427
436
|
prerelease. If the input version is already a prerelease it simply
|
|
428
437
|
increments it.
|
|
438
|
+
* `release` will remove any prerelease part of the version.
|
|
429
439
|
* `identifier` can be used to prefix `premajor`, `preminor`,
|
|
430
440
|
`prepatch`, or `prerelease` version increments. `identifierBase`
|
|
431
441
|
is the base to be used for the `prerelease` identifier.
|
|
@@ -477,7 +487,7 @@ strings that they parse.
|
|
|
477
487
|
|
|
478
488
|
### Ranges
|
|
479
489
|
|
|
480
|
-
* `validRange(range)`: Return the valid range or null if it's not valid
|
|
490
|
+
* `validRange(range)`: Return the valid range or null if it's not valid.
|
|
481
491
|
* `satisfies(version, range)`: Return true if the version satisfies the
|
|
482
492
|
range.
|
|
483
493
|
* `maxSatisfying(versions, range)`: Return the highest version in the list
|
|
@@ -61,6 +61,7 @@ const main = () => {
|
|
|
61
61
|
switch (argv[0]) {
|
|
62
62
|
case 'major': case 'minor': case 'patch': case 'prerelease':
|
|
63
63
|
case 'premajor': case 'preminor': case 'prepatch':
|
|
64
|
+
case 'release':
|
|
64
65
|
inc = argv.shift()
|
|
65
66
|
break
|
|
66
67
|
default:
|
|
@@ -149,7 +150,7 @@ Options:
|
|
|
149
150
|
-i --increment [<level>]
|
|
150
151
|
Increment a version by the specified level. Level can
|
|
151
152
|
be one of: major, minor, patch, premajor, preminor,
|
|
152
|
-
prepatch, or
|
|
153
|
+
prepatch, prerelease, or release. Default level is 'patch'.
|
|
153
154
|
Only one version may be specified.
|
|
154
155
|
|
|
155
156
|
--preid <identifier>
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const debug = require('../internal/debug')
|
|
2
2
|
const { MAX_LENGTH, MAX_SAFE_INTEGER } = require('../internal/constants')
|
|
3
|
-
const { safeRe: re, t } = require('../internal/re')
|
|
3
|
+
const { safeRe: re, safeSrc: src, t } = require('../internal/re')
|
|
4
4
|
|
|
5
5
|
const parseOptions = require('../internal/parse-options')
|
|
6
6
|
const { compareIdentifiers } = require('../internal/identifiers')
|
|
@@ -10,7 +10,7 @@ class SemVer {
|
|
|
10
10
|
|
|
11
11
|
if (version instanceof SemVer) {
|
|
12
12
|
if (version.loose === !!options.loose &&
|
|
13
|
-
|
|
13
|
+
version.includePrerelease === !!options.includePrerelease) {
|
|
14
14
|
return version
|
|
15
15
|
} else {
|
|
16
16
|
version = version.version
|
|
@@ -176,6 +176,20 @@ class SemVer {
|
|
|
176
176
|
// preminor will bump the version up to the next minor release, and immediately
|
|
177
177
|
// down to pre-release. premajor and prepatch work the same way.
|
|
178
178
|
inc (release, identifier, identifierBase) {
|
|
179
|
+
if (release.startsWith('pre')) {
|
|
180
|
+
if (!identifier && identifierBase === false) {
|
|
181
|
+
throw new Error('invalid increment argument: identifier is empty')
|
|
182
|
+
}
|
|
183
|
+
// Avoid an invalid semver results
|
|
184
|
+
if (identifier) {
|
|
185
|
+
const r = new RegExp(`^${this.options.loose ? src[t.PRERELEASELOOSE] : src[t.PRERELEASE]}$`)
|
|
186
|
+
const match = `-${identifier}`.match(r)
|
|
187
|
+
if (!match || match[1] !== identifier) {
|
|
188
|
+
throw new Error(`invalid identifier: ${identifier}`)
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
|
|
179
193
|
switch (release) {
|
|
180
194
|
case 'premajor':
|
|
181
195
|
this.prerelease.length = 0
|
|
@@ -206,6 +220,12 @@ class SemVer {
|
|
|
206
220
|
}
|
|
207
221
|
this.inc('pre', identifier, identifierBase)
|
|
208
222
|
break
|
|
223
|
+
case 'release':
|
|
224
|
+
if (this.prerelease.length === 0) {
|
|
225
|
+
throw new Error(`version ${this.raw} is not a prerelease`)
|
|
226
|
+
}
|
|
227
|
+
this.prerelease.length = 0
|
|
228
|
+
break
|
|
209
229
|
|
|
210
230
|
case 'major':
|
|
211
231
|
// If this is a pre-major version, bump up to the same major version.
|
|
@@ -249,10 +269,6 @@ class SemVer {
|
|
|
249
269
|
case 'pre': {
|
|
250
270
|
const base = Number(identifierBase) ? 1 : 0
|
|
251
271
|
|
|
252
|
-
if (!identifier && identifierBase === false) {
|
|
253
|
-
throw new Error('invalid increment argument: identifier is empty')
|
|
254
|
-
}
|
|
255
|
-
|
|
256
272
|
if (this.prerelease.length === 0) {
|
|
257
273
|
this.prerelease = [base]
|
|
258
274
|
} else {
|
|
@@ -27,20 +27,13 @@ const diff = (version1, version2) => {
|
|
|
27
27
|
return 'major'
|
|
28
28
|
}
|
|
29
29
|
|
|
30
|
-
//
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
30
|
+
// If the main part has no difference
|
|
31
|
+
if (lowVersion.compareMain(highVersion) === 0) {
|
|
32
|
+
if (lowVersion.minor && !lowVersion.patch) {
|
|
33
|
+
return 'minor'
|
|
34
|
+
}
|
|
34
35
|
return 'patch'
|
|
35
36
|
}
|
|
36
|
-
|
|
37
|
-
if (highVersion.minor) {
|
|
38
|
-
// anything higher than a minor bump would result in the wrong version
|
|
39
|
-
return 'minor'
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
// bumping major/minor/patch all have same result
|
|
43
|
-
return 'major'
|
|
44
37
|
}
|
|
45
38
|
|
|
46
39
|
// add the `pre` prefix if we are going to a prerelease version
|
|
@@ -10,6 +10,7 @@ exports = module.exports = {}
|
|
|
10
10
|
const re = exports.re = []
|
|
11
11
|
const safeRe = exports.safeRe = []
|
|
12
12
|
const src = exports.src = []
|
|
13
|
+
const safeSrc = exports.safeSrc = []
|
|
13
14
|
const t = exports.t = {}
|
|
14
15
|
let R = 0
|
|
15
16
|
|
|
@@ -42,6 +43,7 @@ const createToken = (name, value, isGlobal) => {
|
|
|
42
43
|
debug(name, index, value)
|
|
43
44
|
t[name] = index
|
|
44
45
|
src[index] = value
|
|
46
|
+
safeSrc[index] = safe
|
|
45
47
|
re[index] = new RegExp(value, isGlobal ? 'g' : undefined)
|
|
46
48
|
safeRe[index] = new RegExp(safe, isGlobal ? 'g' : undefined)
|
|
47
49
|
}
|
|
@@ -1,20 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "semver",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.7.1",
|
|
4
4
|
"description": "The semantic version parser used by npm.",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"test": "tap",
|
|
8
8
|
"snap": "tap",
|
|
9
|
-
"lint": "eslint
|
|
9
|
+
"lint": "npm run eslint",
|
|
10
10
|
"postlint": "template-oss-check",
|
|
11
|
-
"lintfix": "npm run
|
|
11
|
+
"lintfix": "npm run eslint -- --fix",
|
|
12
12
|
"posttest": "npm run lint",
|
|
13
|
-
"template-oss-apply": "template-oss-apply --force"
|
|
13
|
+
"template-oss-apply": "template-oss-apply --force",
|
|
14
|
+
"eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
|
|
14
15
|
},
|
|
15
16
|
"devDependencies": {
|
|
16
|
-
"@npmcli/eslint-config": "^
|
|
17
|
-
"@npmcli/template-oss": "4.
|
|
17
|
+
"@npmcli/eslint-config": "^5.0.0",
|
|
18
|
+
"@npmcli/template-oss": "4.23.4",
|
|
18
19
|
"benchmark": "^2.1.4",
|
|
19
20
|
"tap": "^16.0.0"
|
|
20
21
|
},
|
|
@@ -51,7 +52,7 @@
|
|
|
51
52
|
"author": "GitHub Inc.",
|
|
52
53
|
"templateOSS": {
|
|
53
54
|
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
|
|
54
|
-
"version": "4.
|
|
55
|
+
"version": "4.23.4",
|
|
55
56
|
"engines": ">=10",
|
|
56
57
|
"distPaths": [
|
|
57
58
|
"classes/",
|
package/dist/package-lock.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@basemaps/lambda-tiler",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.15.0",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "@basemaps/lambda-tiler",
|
|
9
|
-
"version": "7.
|
|
9
|
+
"version": "7.15.0",
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"lerc": "4.0.4",
|
|
@@ -539,9 +539,9 @@
|
|
|
539
539
|
"license": "Apache-2.0"
|
|
540
540
|
},
|
|
541
541
|
"node_modules/semver": {
|
|
542
|
-
"version": "7.
|
|
543
|
-
"resolved": "https://registry.npmjs.org/semver/-/semver-7.
|
|
544
|
-
"integrity": "sha512-
|
|
542
|
+
"version": "7.7.1",
|
|
543
|
+
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
|
|
544
|
+
"integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
|
|
545
545
|
"license": "ISC",
|
|
546
546
|
"bin": {
|
|
547
547
|
"semver": "bin/semver.js"
|
package/dist/package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@basemaps/lambda-tiler",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.15.0",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/linz/basemaps.git",
|
|
@@ -22,12 +22,12 @@
|
|
|
22
22
|
"types": "./build/index.d.ts",
|
|
23
23
|
"license": "MIT",
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@basemaps/config": "^7.
|
|
26
|
-
"@basemaps/config-loader": "^7.
|
|
27
|
-
"@basemaps/geo": "^7.
|
|
28
|
-
"@basemaps/shared": "^7.
|
|
29
|
-
"@basemaps/tiler": "^7.
|
|
30
|
-
"@basemaps/tiler-sharp": "^7.
|
|
25
|
+
"@basemaps/config": "^7.15.0",
|
|
26
|
+
"@basemaps/config-loader": "^7.15.0",
|
|
27
|
+
"@basemaps/geo": "^7.15.0",
|
|
28
|
+
"@basemaps/shared": "^7.15.0",
|
|
29
|
+
"@basemaps/tiler": "^7.15.0",
|
|
30
|
+
"@basemaps/tiler-sharp": "^7.15.0",
|
|
31
31
|
"@linzjs/geojson": "^7.10.0",
|
|
32
32
|
"@linzjs/lambda": "^4.0.0",
|
|
33
33
|
"@mapbox/vector-tile": "^2.0.3",
|
|
@@ -50,11 +50,11 @@
|
|
|
50
50
|
"bundle": "./bundle.sh"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
|
-
"@basemaps/attribution": "^7.
|
|
53
|
+
"@basemaps/attribution": "^7.15.0",
|
|
54
54
|
"@chunkd/fs": "^11.2.0",
|
|
55
55
|
"@types/aws-lambda": "^8.10.75",
|
|
56
56
|
"@types/pixelmatch": "^5.0.0",
|
|
57
57
|
"pretty-json-log": "^1.0.0"
|
|
58
58
|
},
|
|
59
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "a2fa0faa57e5591a50900fd469dbb9637b7d9c8e"
|
|
60
60
|
}
|