@jsdevtools/npm-publish 2.2.1 → 2.2.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.
|
@@ -5,12 +5,12 @@ export interface NpmCliOptions {
|
|
|
5
5
|
ignoreScripts: boolean;
|
|
6
6
|
logger?: Logger | undefined;
|
|
7
7
|
}
|
|
8
|
-
export interface NpmCallResult<CommandT extends
|
|
8
|
+
export interface NpmCallResult<CommandT extends string> {
|
|
9
9
|
successData: SuccessData<CommandT> | undefined;
|
|
10
10
|
errorCode: string | undefined;
|
|
11
11
|
error: Error | undefined;
|
|
12
12
|
}
|
|
13
|
-
type SuccessData<T extends
|
|
13
|
+
type SuccessData<T extends string> = T extends typeof VIEW ? NpmViewData : T extends typeof PUBLISH ? NpmPublishData : unknown;
|
|
14
14
|
export interface NpmViewData {
|
|
15
15
|
"dist-tags": Record<string, string>;
|
|
16
16
|
versions: string[];
|
|
@@ -22,7 +22,6 @@ export interface NpmPublishData {
|
|
|
22
22
|
size: number;
|
|
23
23
|
}[];
|
|
24
24
|
}
|
|
25
|
-
export type Command = typeof VIEW | typeof PUBLISH | string;
|
|
26
25
|
export declare const VIEW = "view";
|
|
27
26
|
export declare const PUBLISH = "publish";
|
|
28
27
|
export declare const E404 = "E404";
|
|
@@ -35,5 +34,5 @@ export declare const EPUBLISHCONFLICT = "EPUBLISHCONFLICT";
|
|
|
35
34
|
* @param options Customize environment variables or add an error handler.
|
|
36
35
|
* @returns The parsed JSON, or stdout if unparsable.
|
|
37
36
|
*/
|
|
38
|
-
export declare function callNpmCli<CommandT extends
|
|
37
|
+
export declare function callNpmCli<CommandT extends string>(command: CommandT, cliArguments: string[], options: NpmCliOptions): Promise<NpmCallResult<CommandT>>;
|
|
39
38
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"call-npm-cli.js","sourceRoot":"","sources":["../../src/npm/call-npm-cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4EAA8C;AAC9C,sDAAyB;AAEzB,qDAAuC;
|
|
1
|
+
{"version":3,"file":"call-npm-cli.js","sourceRoot":"","sources":["../../src/npm/call-npm-cli.ts"],"names":[],"mappings":"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"}
|
package/lib/read-manifest.js
CHANGED
|
@@ -44,8 +44,8 @@ const isDirectory = (file) => {
|
|
|
44
44
|
const isTarball = (file) => {
|
|
45
45
|
return typeof file === "string" && node_path_1.default.extname(file) === TARBALL_EXTNAME;
|
|
46
46
|
};
|
|
47
|
-
const
|
|
48
|
-
return (0, semver_1.valid)(version)
|
|
47
|
+
const validateVersion = (version) => {
|
|
48
|
+
return (0, semver_1.valid)(version) ?? undefined;
|
|
49
49
|
};
|
|
50
50
|
const readPackageJson = async (...pathSegments) => {
|
|
51
51
|
const file = node_path_1.default.resolve(...pathSegments);
|
|
@@ -109,7 +109,7 @@ async function readManifest(packagePath) {
|
|
|
109
109
|
try {
|
|
110
110
|
manifestJson = JSON.parse(manifestContents);
|
|
111
111
|
name = manifestJson["name"];
|
|
112
|
-
version = manifestJson["version"];
|
|
112
|
+
version = validateVersion(manifestJson["version"]);
|
|
113
113
|
publishConfig = manifestJson["publishConfig"] ?? {};
|
|
114
114
|
}
|
|
115
115
|
catch (error) {
|
|
@@ -118,7 +118,7 @@ async function readManifest(packagePath) {
|
|
|
118
118
|
if (typeof name !== "string" || name.length === 0) {
|
|
119
119
|
throw new errors.InvalidPackageNameError(name);
|
|
120
120
|
}
|
|
121
|
-
if (
|
|
121
|
+
if (typeof version !== "string") {
|
|
122
122
|
throw new errors.InvalidPackageVersionError(version);
|
|
123
123
|
}
|
|
124
124
|
if (typeof publishConfig !== "object" ||
|
package/lib/read-manifest.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-manifest.js","sourceRoot":"","sources":["../src/read-manifest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gEAAkC;AAClC,0DAA6B;AAC7B,mCAA8C;AAC9C,6BAAsD;AAEtD,oDAAsC;AAmBtC,MAAM,QAAQ,GAAG,cAAc,CAAC;AAEhC,MAAM,iBAAiB,GAAG,cAAc,CAAC;AACzC,MAAM,eAAe,GAAG,MAAM,CAAC;AAE/B,MAAM,UAAU,GAAG,CAAC,IAAa,EAAkB,EAAE;IACnD,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,mBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,iBAAiB,CAAC;AAC/E,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,IAAa,EAAkB,EAAE;IACpD,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;AAC/D,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,IAAa,EAAkB,EAAE;IAClD,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,eAAe,CAAC;AAC5E,CAAC,CAAC;AAEF,MAAM,
|
|
1
|
+
{"version":3,"file":"read-manifest.js","sourceRoot":"","sources":["../src/read-manifest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gEAAkC;AAClC,0DAA6B;AAC7B,mCAA8C;AAC9C,6BAAsD;AAEtD,oDAAsC;AAmBtC,MAAM,QAAQ,GAAG,cAAc,CAAC;AAEhC,MAAM,iBAAiB,GAAG,cAAc,CAAC;AACzC,MAAM,eAAe,GAAG,MAAM,CAAC;AAE/B,MAAM,UAAU,GAAG,CAAC,IAAa,EAAkB,EAAE;IACnD,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,mBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,iBAAiB,CAAC;AAC/E,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,IAAa,EAAkB,EAAE;IACpD,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;AAC/D,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,IAAa,EAAkB,EAAE;IAClD,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,eAAe,CAAC;AAC5E,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,OAAgB,EAAsB,EAAE;IAC/D,OAAO,IAAA,cAAW,EAAC,OAAiB,CAAC,IAAI,SAAS,CAAC;AACrD,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,KAAK,EAAE,GAAG,YAAsB,EAAmB,EAAE;IAC3E,MAAM,IAAI,GAAG,mBAAI,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,CAAC;IAE3C,IAAI;QACF,OAAO,MAAM,kBAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KACxC;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,IAAI,MAAM,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;KACpD;AACH,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,KAAK,EAAE,IAAY,EAAmB,EAAE;IACrE,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,MAAM,OAAO,GAAG,CAAC,KAAgB,EAAE,EAAE;QACnC,IAAI,KAAK,CAAC,IAAI,KAAK,sBAAsB,EAAE;YACzC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;SAC/C;IACH,CAAC,CAAC;IAEF,IAAI;QACF,MAAM,IAAA,UAAO,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAEjC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;SAC1D;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,IAAI,MAAM,CAAC,uBAAuB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;KACvD;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;AACxC,CAAC,CAAC;AAEF;;;;;GAKG;AACI,KAAK,UAAU,YAAY,CAChC,WAAoB;IAEpB,IAAI,WAA+B,CAAC;IACpC,IAAI,gBAAwB,CAAC;IAE7B,IAAI,CAAC,WAAW,EAAE;QAChB,WAAW,GAAG,EAAE,CAAC;QACjB,gBAAgB,GAAG,MAAM,eAAe,CAAC,iBAAiB,CAAC,CAAC;KAC7D;SAAM,IAAI,UAAU,CAAC,WAAW,CAAC,EAAE;QAClC,WAAW,GAAG,mBAAI,CAAC,OAAO,CAAC,mBAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QACtD,gBAAgB,GAAG,MAAM,eAAe,CAAC,WAAW,CAAC,CAAC;KACvD;SAAM,IAAI,WAAW,CAAC,WAAW,CAAC,EAAE;QACnC,WAAW,GAAG,mBAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACxC,gBAAgB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;KAC1E;SAAM,IAAI,SAAS,CAAC,WAAW,CAAC,EAAE;QACjC,WAAW,GAAG,mBAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACxC,gBAAgB,GAAG,MAAM,sBAAsB,CAAC,WAAW,CAAC,CAAC;KAC9D;SAAM;QACL,MAAM,IAAI,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;KACnD;IAED,IAAI,YAAqC,CAAC;IAC1C,IAAI,IAAa,CAAC;IAClB,IAAI,OAAgB,CAAC;IACrB,IAAI,aAAsB,CAAC;IAE3B,IAAI;QACF,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAA4B,CAAC;QACvE,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QAC5B,OAAO,GAAG,eAAe,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;QACnD,aAAa,GAAG,YAAY,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;KACrD;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,IAAI,MAAM,CAAC,qBAAqB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;KAC5D;IAED,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACjD,MAAM,IAAI,MAAM,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;KAChD;IAED,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,MAAM,IAAI,MAAM,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;KACtD;IAED,IACE,OAAO,aAAa,KAAK,QAAQ;QACjC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC;QAC5B,CAAC,aAAa,EACd;QACA,MAAM,IAAI,MAAM,CAAC,gCAAgC,CAAC,aAAa,CAAC,CAAC;KAClE;IAED,OAAO;QACL,WAAW;QACX,IAAI;QACJ,OAAO;QACP,aAAa;QACb,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;KAChC,CAAC;AACJ,CAAC;AA3DD,oCA2DC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jsdevtools/npm-publish",
|
|
3
3
|
"description": "Fast, easy publishing to NPM",
|
|
4
|
-
"version": "2.2.
|
|
4
|
+
"version": "2.2.2",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"github-action",
|
|
7
7
|
"npm",
|
|
@@ -52,35 +52,35 @@
|
|
|
52
52
|
"provenance": true
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
|
-
"@actions/core": "^1.10.
|
|
56
|
-
"@types/command-line-args": "^5.
|
|
57
|
-
"@types/node": "^20.
|
|
58
|
-
"@types/tar": "^6.1.
|
|
59
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
60
|
-
"@typescript-eslint/parser": "^
|
|
61
|
-
"@vitest/coverage-istanbul": "^0.
|
|
62
|
-
"concurrently": "^8.
|
|
63
|
-
"esbuild": "^0.
|
|
64
|
-
"eslint": "^8.
|
|
65
|
-
"eslint-config-prettier": "^
|
|
66
|
-
"eslint-import-resolver-typescript": "^3.
|
|
67
|
-
"eslint-plugin-import": "npm:eslint-plugin-i@^2.
|
|
68
|
-
"eslint-plugin-jsdoc": "^46.
|
|
69
|
-
"eslint-plugin-n": "^16.
|
|
55
|
+
"@actions/core": "^1.10.1",
|
|
56
|
+
"@types/command-line-args": "^5.2.1",
|
|
57
|
+
"@types/node": "^20.6.0",
|
|
58
|
+
"@types/tar": "^6.1.6",
|
|
59
|
+
"@typescript-eslint/eslint-plugin": "^6.7.0",
|
|
60
|
+
"@typescript-eslint/parser": "^6.7.0",
|
|
61
|
+
"@vitest/coverage-istanbul": "^0.34.4",
|
|
62
|
+
"concurrently": "^8.2.1",
|
|
63
|
+
"esbuild": "^0.19.2",
|
|
64
|
+
"eslint": "^8.49.0",
|
|
65
|
+
"eslint-config-prettier": "^9.0.0",
|
|
66
|
+
"eslint-import-resolver-typescript": "^3.6.0",
|
|
67
|
+
"eslint-plugin-import": "npm:eslint-plugin-i@^2.28.1",
|
|
68
|
+
"eslint-plugin-jsdoc": "^46.6.0",
|
|
69
|
+
"eslint-plugin-n": "^16.1.0",
|
|
70
70
|
"eslint-plugin-promise": "^6.1.1",
|
|
71
|
-
"eslint-plugin-sonarjs": "^0.
|
|
72
|
-
"eslint-plugin-unicorn": "^
|
|
73
|
-
"prettier": "^
|
|
74
|
-
"prettier-plugin-jsdoc": "^0.
|
|
75
|
-
"rimraf": "^5.0.
|
|
76
|
-
"typescript": "^5.
|
|
77
|
-
"vitest": "^0.
|
|
71
|
+
"eslint-plugin-sonarjs": "^0.21.0",
|
|
72
|
+
"eslint-plugin-unicorn": "^48.0.1",
|
|
73
|
+
"prettier": "^3.0.3",
|
|
74
|
+
"prettier-plugin-jsdoc": "^1.0.2",
|
|
75
|
+
"rimraf": "^5.0.1",
|
|
76
|
+
"typescript": "^5.2.2",
|
|
77
|
+
"vitest": "^0.34.4",
|
|
78
78
|
"vitest-when": "^0.1.2"
|
|
79
79
|
},
|
|
80
80
|
"dependencies": {
|
|
81
|
-
"@types/semver": "^7.5.
|
|
82
|
-
"command-line-args": "^5.
|
|
83
|
-
"semver": "
|
|
84
|
-
"tar": "
|
|
81
|
+
"@types/semver": "^7.5.1",
|
|
82
|
+
"command-line-args": "^5.2.1",
|
|
83
|
+
"semver": "7.5.4",
|
|
84
|
+
"tar": "6.2.0"
|
|
85
85
|
}
|
|
86
86
|
}
|
package/src/npm/call-npm-cli.ts
CHANGED
|
@@ -11,13 +11,13 @@ export interface NpmCliOptions {
|
|
|
11
11
|
logger?: Logger | undefined;
|
|
12
12
|
}
|
|
13
13
|
|
|
14
|
-
export interface NpmCallResult<CommandT extends
|
|
14
|
+
export interface NpmCallResult<CommandT extends string> {
|
|
15
15
|
successData: SuccessData<CommandT> | undefined;
|
|
16
16
|
errorCode: string | undefined;
|
|
17
17
|
error: Error | undefined;
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
-
type SuccessData<T extends
|
|
20
|
+
type SuccessData<T extends string> = T extends typeof VIEW
|
|
21
21
|
? NpmViewData
|
|
22
22
|
: T extends typeof PUBLISH
|
|
23
23
|
? NpmPublishData
|
|
@@ -32,7 +32,6 @@ export interface NpmPublishData {
|
|
|
32
32
|
files: { path: string; size: number }[];
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
export type Command = typeof VIEW | typeof PUBLISH | string;
|
|
36
35
|
export const VIEW = "view";
|
|
37
36
|
export const PUBLISH = "publish";
|
|
38
37
|
|
|
@@ -53,7 +52,7 @@ const baseArguments = (options: NpmCliOptions) =>
|
|
|
53
52
|
* @param options Customize environment variables or add an error handler.
|
|
54
53
|
* @returns The parsed JSON, or stdout if unparsable.
|
|
55
54
|
*/
|
|
56
|
-
export async function callNpmCli<CommandT extends
|
|
55
|
+
export async function callNpmCli<CommandT extends string>(
|
|
57
56
|
command: CommandT,
|
|
58
57
|
cliArguments: string[],
|
|
59
58
|
options: NpmCliOptions
|
package/src/read-manifest.ts
CHANGED
|
@@ -39,8 +39,8 @@ const isTarball = (file: unknown): file is string => {
|
|
|
39
39
|
return typeof file === "string" && path.extname(file) === TARBALL_EXTNAME;
|
|
40
40
|
};
|
|
41
41
|
|
|
42
|
-
const
|
|
43
|
-
return semverValid(version as string)
|
|
42
|
+
const validateVersion = (version: unknown): string | undefined => {
|
|
43
|
+
return semverValid(version as string) ?? undefined;
|
|
44
44
|
};
|
|
45
45
|
|
|
46
46
|
const readPackageJson = async (...pathSegments: string[]): Promise<string> => {
|
|
@@ -110,7 +110,7 @@ export async function readManifest(
|
|
|
110
110
|
try {
|
|
111
111
|
manifestJson = JSON.parse(manifestContents) as Record<string, unknown>;
|
|
112
112
|
name = manifestJson["name"];
|
|
113
|
-
version = manifestJson["version"];
|
|
113
|
+
version = validateVersion(manifestJson["version"]);
|
|
114
114
|
publishConfig = manifestJson["publishConfig"] ?? {};
|
|
115
115
|
} catch (error) {
|
|
116
116
|
throw new errors.PackageJsonParseError(packageSpec, error);
|
|
@@ -120,7 +120,7 @@ export async function readManifest(
|
|
|
120
120
|
throw new errors.InvalidPackageNameError(name);
|
|
121
121
|
}
|
|
122
122
|
|
|
123
|
-
if (
|
|
123
|
+
if (typeof version !== "string") {
|
|
124
124
|
throw new errors.InvalidPackageVersionError(version);
|
|
125
125
|
}
|
|
126
126
|
|