modpack-lock 0.7.0 → 0.8.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/README.md +9 -4
- package/build/config/api.d.ts +2 -0
- package/build/config/api.d.ts.map +1 -1
- package/build/config/api.js +2 -0
- package/build/config/api.js.map +1 -1
- package/build/generate_json.d.ts +9 -2
- package/build/generate_json.d.ts.map +1 -1
- package/build/generate_json.js +40 -10
- package/build/generate_json.js.map +1 -1
- package/build/modpack-lock.d.ts +4 -4
- package/build/modpack-lock.d.ts.map +1 -1
- package/build/modpack-lock.js +2 -2
- package/build/modpack-lock.js.map +1 -1
- package/build/modrinth_interactions.d.ts.map +1 -1
- package/build/modrinth_interactions.js +5 -0
- package/build/modrinth_interactions.js.map +1 -1
- package/build/types/Jsonfile.d.ts +12 -1
- package/build/types/Jsonfile.d.ts.map +1 -1
- package/package.json +2 -3
package/README.md
CHANGED
|
@@ -172,6 +172,7 @@ For programmatic usage, `modpack-lock` exports these functions:
|
|
|
172
172
|
- `getModpackInfo()`
|
|
173
173
|
- `getLockfile()`
|
|
174
174
|
- `generateJson()`
|
|
175
|
+
- `normalizeDependencies()`
|
|
175
176
|
- `generateGitignoreRules()`
|
|
176
177
|
- `generateReadmeFiles()`
|
|
177
178
|
- `generateLicense()`
|
|
@@ -233,10 +234,14 @@ The JSON file contains your modpack metadata and a dependency list:
|
|
|
233
234
|
"example": "echo 'example script'"
|
|
234
235
|
},
|
|
235
236
|
"dependencies": {
|
|
236
|
-
"mods":
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
237
|
+
"mods": {
|
|
238
|
+
"fabric-api": "0.141.2+1.21.11",
|
|
239
|
+
"example-mod": "1.2.3",
|
|
240
|
+
"mods/local-mod.jar": "*"
|
|
241
|
+
},
|
|
242
|
+
"resourcepacks": { ... },
|
|
243
|
+
"datapacks": { ... },
|
|
244
|
+
"shaderpacks": { ... }
|
|
240
245
|
}
|
|
241
246
|
}
|
|
242
247
|
```
|
package/build/config/api.d.ts
CHANGED
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
export declare const PACKAGE_USER_AGENT: string;
|
|
3
3
|
/** Modrinth API base URL */
|
|
4
4
|
export declare const MODRINTH_API_BASE: string;
|
|
5
|
+
/** Default timeout for Modrinth API requests */
|
|
6
|
+
export declare const MODRINTH_API_TIMEOUT: number;
|
|
5
7
|
/** Modrinth version files endpoint */
|
|
6
8
|
export declare const MODRINTH_VERSION_FILES_ENDPOINT: string;
|
|
7
9
|
/** Modrinth projects endpoint */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/config/api.ts"],"names":[],"mappings":"AAGA,kDAAkD;AAClD,eAAO,MAAM,kBAAkB,EAAE,MAAkE,CAAC;AAEpG,4BAA4B;AAC5B,eAAO,MAAM,iBAAiB,EAAE,MAAsC,CAAC;AAEvE,sCAAsC;AACtC,eAAO,MAAM,+BAA+B,EAAE,MAA6C,CAAC;AAE5F,iCAAiC;AACjC,eAAO,MAAM,0BAA0B,EAAE,MAAwC,CAAC;AAElF,8BAA8B;AAC9B,eAAO,MAAM,uBAAuB,EAAE,MAAqC,CAAC;AAE5E,2CAA2C;AAC3C,eAAO,MAAM,oCAAoC,EAAE,MAAgD,CAAC;AAEpG,mCAAmC;AACnC,eAAO,MAAM,4BAA4B,EAAE,MAA0C,CAAC;AAEtF,2CAA2C;AAC3C,eAAO,MAAM,UAAU,EAAE,MAAY,CAAC;AAEtC,0BAA0B;AAC1B,eAAO,MAAM,eAAe,EAAE,MAAiC,CAAC;AAEhE,+BAA+B;AAC/B,eAAO,MAAM,wBAAwB,EAAE,MAAsC,CAAC;AAE9E,wCAAwC;AACxC,eAAO,MAAM,iCAAiC,EAAE,MAAoD,CAAC;AAErG,8BAA8B;AAC9B,eAAO,MAAM,uBAAuB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,
|
|
1
|
+
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/config/api.ts"],"names":[],"mappings":"AAGA,kDAAkD;AAClD,eAAO,MAAM,kBAAkB,EAAE,MAAkE,CAAC;AAEpG,4BAA4B;AAC5B,eAAO,MAAM,iBAAiB,EAAE,MAAsC,CAAC;AAEvE,gDAAgD;AAChD,eAAO,MAAM,oBAAoB,EAAE,MAAa,CAAC;AAEjD,sCAAsC;AACtC,eAAO,MAAM,+BAA+B,EAAE,MAA6C,CAAC;AAE5F,iCAAiC;AACjC,eAAO,MAAM,0BAA0B,EAAE,MAAwC,CAAC;AAElF,8BAA8B;AAC9B,eAAO,MAAM,uBAAuB,EAAE,MAAqC,CAAC;AAE5E,2CAA2C;AAC3C,eAAO,MAAM,oCAAoC,EAAE,MAAgD,CAAC;AAEpG,mCAAmC;AACnC,eAAO,MAAM,4BAA4B,EAAE,MAA0C,CAAC;AAEtF,2CAA2C;AAC3C,eAAO,MAAM,UAAU,EAAE,MAAY,CAAC;AAEtC,0BAA0B;AAC1B,eAAO,MAAM,eAAe,EAAE,MAAiC,CAAC;AAEhE,+BAA+B;AAC/B,eAAO,MAAM,wBAAwB,EAAE,MAAsC,CAAC;AAE9E,wCAAwC;AACxC,eAAO,MAAM,iCAAiC,EAAE,MAAoD,CAAC;AAErG,8BAA8B;AAC9B,eAAO,MAAM,uBAAuB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MACf,CAAC;AAE7C,mCAAmC;AACnC,eAAO,MAAM,oBAAoB,EAAE,MAAsC,CAAC"}
|
package/build/config/api.js
CHANGED
|
@@ -4,6 +4,8 @@ import * as constants from "./constants.js";
|
|
|
4
4
|
export const PACKAGE_USER_AGENT = `${constants.AUTHOR_USERNAME}/${pkg.name}/${pkg.version}`;
|
|
5
5
|
/** Modrinth API base URL */
|
|
6
6
|
export const MODRINTH_API_BASE = "https://api.modrinth.com/v2";
|
|
7
|
+
/** Default timeout for Modrinth API requests */
|
|
8
|
+
export const MODRINTH_API_TIMEOUT = 3000;
|
|
7
9
|
/** Modrinth version files endpoint */
|
|
8
10
|
export const MODRINTH_VERSION_FILES_ENDPOINT = `${MODRINTH_API_BASE}/version_files`;
|
|
9
11
|
/** Modrinth projects endpoint */
|
package/build/config/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/config/api.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,oBAAoB,CAAC,OAAM,IAAI,EAAE,MAAM,EAAC,CAAC;AACzD,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAE5C,kDAAkD;AAClD,MAAM,CAAC,MAAM,kBAAkB,GAAW,GAAG,SAAS,CAAC,eAAe,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;AAEpG,4BAA4B;AAC5B,MAAM,CAAC,MAAM,iBAAiB,GAAW,6BAA6B,CAAC;AAEvE,sCAAsC;AACtC,MAAM,CAAC,MAAM,+BAA+B,GAAW,GAAG,iBAAiB,gBAAgB,CAAC;AAE5F,iCAAiC;AACjC,MAAM,CAAC,MAAM,0BAA0B,GAAW,GAAG,iBAAiB,WAAW,CAAC;AAElF,8BAA8B;AAC9B,MAAM,CAAC,MAAM,uBAAuB,GAAW,GAAG,iBAAiB,QAAQ,CAAC;AAE5E,2CAA2C;AAC3C,MAAM,CAAC,MAAM,oCAAoC,GAAW,GAAG,iBAAiB,mBAAmB,CAAC;AAEpG,mCAAmC;AACnC,MAAM,CAAC,MAAM,4BAA4B,GAAW,GAAG,iBAAiB,aAAa,CAAC;AAEtF,2CAA2C;AAC3C,MAAM,CAAC,MAAM,UAAU,GAAW,GAAG,CAAC;AAEtC,0BAA0B;AAC1B,MAAM,CAAC,MAAM,eAAe,GAAW,wBAAwB,CAAC;AAEhE,+BAA+B;AAC/B,MAAM,CAAC,MAAM,wBAAwB,GAAW,GAAG,eAAe,WAAW,CAAC;AAE9E,wCAAwC;AACxC,MAAM,CAAC,MAAM,iCAAiC,GAAW,GAAG,wBAAwB,gBAAgB,CAAC;AAErG,8BAA8B;AAC9B,MAAM,CAAC,MAAM,uBAAuB,GAAgC,CAAC,OAAO,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/config/api.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,oBAAoB,CAAC,OAAM,IAAI,EAAE,MAAM,EAAC,CAAC;AACzD,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAE5C,kDAAkD;AAClD,MAAM,CAAC,MAAM,kBAAkB,GAAW,GAAG,SAAS,CAAC,eAAe,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;AAEpG,4BAA4B;AAC5B,MAAM,CAAC,MAAM,iBAAiB,GAAW,6BAA6B,CAAC;AAEvE,gDAAgD;AAChD,MAAM,CAAC,MAAM,oBAAoB,GAAW,IAAI,CAAC;AAEjD,sCAAsC;AACtC,MAAM,CAAC,MAAM,+BAA+B,GAAW,GAAG,iBAAiB,gBAAgB,CAAC;AAE5F,iCAAiC;AACjC,MAAM,CAAC,MAAM,0BAA0B,GAAW,GAAG,iBAAiB,WAAW,CAAC;AAElF,8BAA8B;AAC9B,MAAM,CAAC,MAAM,uBAAuB,GAAW,GAAG,iBAAiB,QAAQ,CAAC;AAE5E,2CAA2C;AAC3C,MAAM,CAAC,MAAM,oCAAoC,GAAW,GAAG,iBAAiB,mBAAmB,CAAC;AAEpG,mCAAmC;AACnC,MAAM,CAAC,MAAM,4BAA4B,GAAW,GAAG,iBAAiB,aAAa,CAAC;AAEtF,2CAA2C;AAC3C,MAAM,CAAC,MAAM,UAAU,GAAW,GAAG,CAAC;AAEtC,0BAA0B;AAC1B,MAAM,CAAC,MAAM,eAAe,GAAW,wBAAwB,CAAC;AAEhE,+BAA+B;AAC/B,MAAM,CAAC,MAAM,wBAAwB,GAAW,GAAG,eAAe,WAAW,CAAC;AAE9E,wCAAwC;AACxC,MAAM,CAAC,MAAM,iCAAiC,GAAW,GAAG,wBAAwB,gBAAgB,CAAC;AAErG,8BAA8B;AAC9B,MAAM,CAAC,MAAM,uBAAuB,GAAgC,CAAC,OAAO,EAAE,EAAE,CAC5E,GAAG,eAAe,aAAa,OAAO,EAAE,CAAC;AAE7C,mCAAmC;AACnC,MAAM,CAAC,MAAM,oBAAoB,GAAW,6BAA6B,CAAC"}
|
package/build/generate_json.d.ts
CHANGED
|
@@ -1,4 +1,11 @@
|
|
|
1
|
-
import type { Lockfile, Jsonfile, Options, InitOptions } from "./types/index.js";
|
|
1
|
+
import type { Lockfile, Jsonfile, Options, InitOptions, DependencyCategory, DependencyMap } from "./types/index.js";
|
|
2
|
+
/**
|
|
3
|
+
* Normalize dependencies from the legacy array-of-strings format to the
|
|
4
|
+
* current versioned-object format. Passes through objects unchanged.
|
|
5
|
+
* @param dependencies - The raw dependencies object from modpack.json
|
|
6
|
+
* @returns Normalized dependencies with {@link DependencyMap} entries per category
|
|
7
|
+
*/
|
|
8
|
+
export declare function normalizeDependencies(dependencies: Jsonfile["dependencies"] | null): Partial<Record<DependencyCategory, DependencyMap>>;
|
|
2
9
|
/**
|
|
3
10
|
* Generate a modpack.json file
|
|
4
11
|
* @param modpackInfo - The modpack information
|
|
@@ -7,5 +14,5 @@ import type { Lockfile, Jsonfile, Options, InitOptions } from "./types/index.js"
|
|
|
7
14
|
* @param options - The options object
|
|
8
15
|
* @returns The JSON file's object
|
|
9
16
|
*/
|
|
10
|
-
export
|
|
17
|
+
export declare function generateJson(modpackInfo: Jsonfile, lockfile: Lockfile, workingDir: string, options?: Options | InitOptions): Promise<Jsonfile>;
|
|
11
18
|
//# sourceMappingURL=generate_json.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate_json.d.ts","sourceRoot":"","sources":["../src/generate_json.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"generate_json.d.ts","sourceRoot":"","sources":["../src/generate_json.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAElH;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACjC,YAAY,EAAE,QAAQ,CAAC,cAAc,CAAC,GAAG,IAAI,GAC9C,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC,CAmBpD;AAqBD;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAC9B,WAAW,EAAE,QAAQ,EACrB,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,OAAO,GAAG,WAAgB,GACpC,OAAO,CAAC,QAAQ,CAAC,CAoFnB"}
|
package/build/generate_json.js
CHANGED
|
@@ -3,6 +3,34 @@ import path from "path";
|
|
|
3
3
|
import { getProjects } from "./modrinth_interactions.js";
|
|
4
4
|
import * as config from "./config/index.js";
|
|
5
5
|
import { logm } from "./logger.js";
|
|
6
|
+
/**
|
|
7
|
+
* Normalize dependencies from the legacy array-of-strings format to the
|
|
8
|
+
* current versioned-object format. Passes through objects unchanged.
|
|
9
|
+
* @param dependencies - The raw dependencies object from modpack.json
|
|
10
|
+
* @returns Normalized dependencies with {@link DependencyMap} entries per category
|
|
11
|
+
*/
|
|
12
|
+
export function normalizeDependencies(dependencies) {
|
|
13
|
+
if (!dependencies || typeof dependencies !== "object")
|
|
14
|
+
return {};
|
|
15
|
+
const normalized = {};
|
|
16
|
+
for (const [key, entries] of Object.entries(dependencies)) {
|
|
17
|
+
const category = key;
|
|
18
|
+
if (Array.isArray(entries)) {
|
|
19
|
+
const map = {};
|
|
20
|
+
for (const entry of entries) {
|
|
21
|
+
map[entry] = "*";
|
|
22
|
+
}
|
|
23
|
+
normalized[category] = map;
|
|
24
|
+
}
|
|
25
|
+
else if (typeof entries === "object" && entries !== null) {
|
|
26
|
+
normalized[category] = entries;
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
normalized[category] = {};
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
return normalized;
|
|
33
|
+
}
|
|
6
34
|
/**
|
|
7
35
|
* Create a JSON object from the modpack information and dependencies
|
|
8
36
|
*/
|
|
@@ -28,7 +56,7 @@ async function writeJson(jsonObject, outputPath) {
|
|
|
28
56
|
* @param options - The options object
|
|
29
57
|
* @returns The JSON file's object
|
|
30
58
|
*/
|
|
31
|
-
export
|
|
59
|
+
export async function generateJson(modpackInfo, lockfile, workingDir, options = {}) {
|
|
32
60
|
logm.quietFromOptions(options);
|
|
33
61
|
// Validate modpack info
|
|
34
62
|
const missingFields = [];
|
|
@@ -47,24 +75,26 @@ export default async function generateJson(modpackInfo, lockfile, workingDir, op
|
|
|
47
75
|
datapacks: new Set(),
|
|
48
76
|
shaderpacks: new Set(),
|
|
49
77
|
};
|
|
78
|
+
const versionNumbers = {};
|
|
50
79
|
const packDependencies = {
|
|
51
|
-
mods:
|
|
52
|
-
resourcepacks:
|
|
53
|
-
datapacks:
|
|
54
|
-
shaderpacks:
|
|
80
|
+
mods: {},
|
|
81
|
+
resourcepacks: {},
|
|
82
|
+
datapacks: {},
|
|
83
|
+
shaderpacks: {},
|
|
55
84
|
};
|
|
56
|
-
// Collect project IDs from lockfile
|
|
85
|
+
// Collect project IDs and version numbers from lockfile
|
|
57
86
|
if (lockfile)
|
|
58
87
|
if (lockfile.dependencies) {
|
|
59
88
|
for (const category of config.DEPENDENCY_CATEGORIES) {
|
|
60
89
|
if (lockfile.dependencies[category]) {
|
|
61
|
-
// TODO: consider initializing the categories with an empty
|
|
90
|
+
// TODO: consider initializing the categories with an empty object/set here
|
|
62
91
|
for (const entry of lockfile.dependencies[category]) {
|
|
63
92
|
if (entry.version && entry.version.project_id) {
|
|
64
93
|
projectIds[category].add(entry.version.project_id);
|
|
94
|
+
versionNumbers[entry.version.project_id] = entry.version.version_number || "*";
|
|
65
95
|
}
|
|
66
96
|
else {
|
|
67
|
-
packDependencies[category]
|
|
97
|
+
packDependencies[category][entry.path] = "*";
|
|
68
98
|
}
|
|
69
99
|
}
|
|
70
100
|
}
|
|
@@ -83,12 +113,12 @@ export default async function generateJson(modpackInfo, lockfile, workingDir, op
|
|
|
83
113
|
projectsMap[project.id] = project.slug || project.id;
|
|
84
114
|
}
|
|
85
115
|
}
|
|
86
|
-
// Add projects to dependencies by category
|
|
116
|
+
// Add projects to dependencies by category with their version numbers
|
|
87
117
|
for (const category of config.DEPENDENCY_CATEGORIES) {
|
|
88
118
|
for (const projectId of projectIds[category]) {
|
|
89
119
|
const projectSlug = projectsMap[projectId];
|
|
90
120
|
if (projectSlug) {
|
|
91
|
-
packDependencies[category]
|
|
121
|
+
packDependencies[category][projectSlug] = versionNumbers[projectId] || "*";
|
|
92
122
|
}
|
|
93
123
|
}
|
|
94
124
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate_json.js","sourceRoot":"","sources":["../src/generate_json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,WAAW,EAAC,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAC,IAAI,EAAC,MAAM,aAAa,CAAC;AAGjC;;GAEG;AACH,SAAS,iBAAiB,CAAC,WAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"generate_json.js","sourceRoot":"","sources":["../src/generate_json.ts"],"names":[],"mappings":"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"}
|
package/build/modpack-lock.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { generateLockfile } from "./generate_lockfile.js";
|
|
2
2
|
import { generateReadmeFiles } from "./generate_readme.js";
|
|
3
3
|
import { generateGitignoreRules } from "./generate_gitignore.js";
|
|
4
|
-
import generateJson from "./generate_json.js";
|
|
4
|
+
import { generateJson, normalizeDependencies } from "./generate_json.js";
|
|
5
5
|
import generateLicense from "./generate_license.js";
|
|
6
6
|
import { promptUserForInfo } from "./user_prompts.js";
|
|
7
7
|
import { getModpackInfo, getLockfile } from "./directory_scanning.js";
|
|
8
|
-
import type { Jsonfile, Options, InitOptions, Lockfile, ModpackInfo, DependencyCategory, LockfileDependency, ContentVersion, VersionDependency } from "./types/index.js";
|
|
8
|
+
import type { Jsonfile, DependencyMap, Options, InitOptions, Lockfile, ModpackInfo, DependencyCategory, LockfileDependency, ContentVersion, VersionDependency } from "./types/index.js";
|
|
9
9
|
/**
|
|
10
10
|
* @license MIT
|
|
11
11
|
* @author nickesc
|
|
@@ -19,7 +19,7 @@ import type { Jsonfile, Options, InitOptions, Lockfile, ModpackInfo, DependencyC
|
|
|
19
19
|
* @returns The lockfile object
|
|
20
20
|
*/
|
|
21
21
|
declare function generateModpackFiles(modpackInfo: Jsonfile, workingDir: string, options?: Options | InitOptions): Promise<Lockfile>;
|
|
22
|
-
export { generateModpackFiles, generateJson, generateLockfile, generateGitignoreRules, generateReadmeFiles, generateLicense, getModpackInfo, getLockfile, promptUserForInfo, };
|
|
22
|
+
export { generateModpackFiles, generateJson, normalizeDependencies, generateLockfile, generateGitignoreRules, generateReadmeFiles, generateLicense, getModpackInfo, getLockfile, promptUserForInfo, };
|
|
23
23
|
export type { Lockfile, //
|
|
24
|
-
ModpackInfo, Jsonfile, Options, InitOptions, DependencyCategory, LockfileDependency, ContentVersion, VersionDependency, };
|
|
24
|
+
ModpackInfo, Jsonfile, DependencyMap, Options, InitOptions, DependencyCategory, LockfileDependency, ContentVersion, VersionDependency, };
|
|
25
25
|
//# sourceMappingURL=modpack-lock.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modpack-lock.d.ts","sourceRoot":"","sources":["../src/modpack-lock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAC,mBAAmB,EAAC,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAC,sBAAsB,EAAC,MAAM,yBAAyB,CAAC;AAC/D,OAAO,YAAY,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"modpack-lock.d.ts","sourceRoot":"","sources":["../src/modpack-lock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAC,mBAAmB,EAAC,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAC,sBAAsB,EAAC,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAC,YAAY,EAAE,qBAAqB,EAAC,MAAM,oBAAoB,CAAC;AACvE,OAAO,eAAe,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAC,cAAc,EAAE,WAAW,EAAC,MAAM,yBAAyB,CAAC;AACpE,OAAO,KAAK,EACR,QAAQ,EACR,aAAa,EACb,OAAO,EACP,WAAW,EACX,QAAQ,EACR,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACpB,MAAM,kBAAkB,CAAC;AAE1B;;;;GAIG;AAEH;;;;;;GAMG;AACH,iBAAe,oBAAoB,CAC/B,WAAW,EAAE,QAAQ,EACrB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,OAAO,GAAG,WAAgB,GACpC,OAAO,CAAC,QAAQ,CAAC,CA2BnB;AAED,OAAO,EACH,oBAAoB,EACpB,YAAY,EACZ,qBAAqB,EACrB,gBAAgB,EAChB,sBAAsB,EACtB,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,WAAW,EACX,iBAAiB,GACpB,CAAC;AACF,YAAY,EACR,QAAQ,EAAE,EAAE;AACZ,WAAW,EACX,QAAQ,EACR,aAAa,EACb,OAAO,EACP,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,cAAc,EACd,iBAAiB,GACpB,CAAC"}
|
package/build/modpack-lock.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { generateLockfile } from "./generate_lockfile.js";
|
|
2
2
|
import { generateReadmeFiles } from "./generate_readme.js";
|
|
3
3
|
import { generateGitignoreRules } from "./generate_gitignore.js";
|
|
4
|
-
import generateJson from "./generate_json.js";
|
|
4
|
+
import { generateJson, normalizeDependencies } from "./generate_json.js";
|
|
5
5
|
import generateLicense from "./generate_license.js";
|
|
6
6
|
import { logm } from "./logger.js";
|
|
7
7
|
import { promptUserForInfo } from "./user_prompts.js";
|
|
@@ -39,5 +39,5 @@ async function generateModpackFiles(modpackInfo, workingDir, options = {}) {
|
|
|
39
39
|
}
|
|
40
40
|
return lockfile;
|
|
41
41
|
}
|
|
42
|
-
export { generateModpackFiles, generateJson, generateLockfile, generateGitignoreRules, generateReadmeFiles, generateLicense, getModpackInfo, getLockfile, promptUserForInfo, };
|
|
42
|
+
export { generateModpackFiles, generateJson, normalizeDependencies, generateLockfile, generateGitignoreRules, generateReadmeFiles, generateLicense, getModpackInfo, getLockfile, promptUserForInfo, };
|
|
43
43
|
//# sourceMappingURL=modpack-lock.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modpack-lock.js","sourceRoot":"","sources":["../src/modpack-lock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAC,mBAAmB,EAAC,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAC,sBAAsB,EAAC,MAAM,yBAAyB,CAAC;AAC/D,OAAO,YAAY,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"modpack-lock.js","sourceRoot":"","sources":["../src/modpack-lock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAC,mBAAmB,EAAC,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAC,sBAAsB,EAAC,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAC,YAAY,EAAE,qBAAqB,EAAC,MAAM,oBAAoB,CAAC;AACvE,OAAO,eAAe,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAC,IAAI,EAAC,MAAM,aAAa,CAAC;AACjC,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAC,cAAc,EAAE,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAcpE;;;;GAIG;AAEH;;;;;;GAMG;AACH,KAAK,UAAU,oBAAoB,CAC/B,WAAqB,EACrB,UAAkB,EAClB,UAAiC,EAAE;IAEnC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAE/B,MAAM,QAAQ,GAAa,MAAM,gBAAgB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAEvE,MAAM,YAAY,CAAC,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAE/D,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QAC7D,IAAI,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;IAC7C,CAAC;IAED,gCAAgC;IAChC,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;QACtB,MAAM,eAAe,CAAC,WAAW,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IAED,kCAAkC;IAClC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACpB,MAAM,sBAAsB,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAChE,CAAC;IAED,qCAAqC;IACrC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACjB,MAAM,mBAAmB,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,OAAO,EACH,oBAAoB,EACpB,YAAY,EACZ,qBAAqB,EACrB,gBAAgB,EAChB,sBAAsB,EACtB,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,WAAW,EACX,iBAAiB,GACpB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modrinth_interactions.d.ts","sourceRoot":"","sources":["../src/modrinth_interactions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,KAAK,EACR,cAAc,EACd,mBAAmB,EAGnB,gBAAgB,EACnB,MAAM,kBAAkB,CAAC;AAa1B;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"modrinth_interactions.d.ts","sourceRoot":"","sources":["../src/modrinth_interactions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,KAAK,EACR,cAAc,EACd,mBAAmB,EAGnB,gBAAgB,EACnB,MAAM,kBAAkB,CAAC;AAa1B;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAiCrG;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAoCtF;AAED;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAoC7E;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAkC9D;AAED;;;GAGG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CA2BvD"}
|
|
@@ -30,6 +30,7 @@ export async function getVersionsFromHashes(hashes) {
|
|
|
30
30
|
hashes: hashes,
|
|
31
31
|
algorithm: "sha1",
|
|
32
32
|
}),
|
|
33
|
+
signal: AbortSignal.timeout(config.MODRINTH_API_TIMEOUT),
|
|
33
34
|
});
|
|
34
35
|
if (!response.ok) {
|
|
35
36
|
const errorText = await response.text();
|
|
@@ -65,6 +66,7 @@ export async function getProjects(projectIds) {
|
|
|
65
66
|
headers: {
|
|
66
67
|
"User-Agent": config.PACKAGE_USER_AGENT,
|
|
67
68
|
},
|
|
69
|
+
signal: AbortSignal.timeout(config.MODRINTH_API_TIMEOUT),
|
|
68
70
|
});
|
|
69
71
|
if (!response.ok) {
|
|
70
72
|
const errorText = await response.text();
|
|
@@ -103,6 +105,7 @@ export async function getUsers(userIds) {
|
|
|
103
105
|
headers: {
|
|
104
106
|
"User-Agent": config.PACKAGE_USER_AGENT,
|
|
105
107
|
},
|
|
108
|
+
signal: AbortSignal.timeout(config.MODRINTH_API_TIMEOUT),
|
|
106
109
|
});
|
|
107
110
|
if (!response.ok) {
|
|
108
111
|
const errorText = await response.text();
|
|
@@ -134,6 +137,7 @@ export async function getMinecraftVersions() {
|
|
|
134
137
|
headers: {
|
|
135
138
|
"User-Agent": config.PACKAGE_USER_AGENT,
|
|
136
139
|
},
|
|
140
|
+
signal: AbortSignal.timeout(config.MODRINTH_API_TIMEOUT),
|
|
137
141
|
});
|
|
138
142
|
if (!response.ok) {
|
|
139
143
|
const errorText = await response.text();
|
|
@@ -171,6 +175,7 @@ export async function getModloaders() {
|
|
|
171
175
|
headers: {
|
|
172
176
|
"User-Agent": config.PACKAGE_USER_AGENT,
|
|
173
177
|
},
|
|
178
|
+
signal: AbortSignal.timeout(config.MODRINTH_API_TIMEOUT),
|
|
174
179
|
});
|
|
175
180
|
if (!response.ok) {
|
|
176
181
|
const errorText = await response.text();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modrinth_interactions.js","sourceRoot":"","sources":["../src/modrinth_interactions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAC,IAAI,EAAC,MAAM,aAAa,CAAC;AAUjC;;GAEG;AACH,SAAS,UAAU,CAAC,KAAY,EAAE,IAAY;IAC1C,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,MAAgB;IACxD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,IAAI,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,+BAA+B,EAAE;YACjE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACL,cAAc,EAAE,kBAAkB;gBAClC,YAAY,EAAE,MAAM,CAAC,kBAAkB;aAC1C;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACjB,MAAM,EAAE,MAAM;gBACd,SAAS,EAAE,MAAM;aACpB,CAAC;
|
|
1
|
+
{"version":3,"file":"modrinth_interactions.js","sourceRoot":"","sources":["../src/modrinth_interactions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
import type { DependencyCategory, ModpackInfo } from "./index.js";
|
|
2
|
+
/**
|
|
3
|
+
* A map of content names (Modrinth slugs or file paths) to version strings.
|
|
4
|
+
* Non-Modrinth content uses `"*"` to indicate an unversioned/local file.
|
|
5
|
+
*/
|
|
6
|
+
export type DependencyMap = Record<string, string>;
|
|
7
|
+
/**
|
|
8
|
+
* Legacy dependency format: a flat array of name strings without version info.
|
|
9
|
+
* Accepted on read for backward compatibility; normalised to {@link DependencyMap}
|
|
10
|
+
* via {@link normalizeDependencies} at runtime.
|
|
11
|
+
*/
|
|
12
|
+
export type LegacyDependencyList = string[];
|
|
2
13
|
/**
|
|
3
14
|
* The modpack.json file's shape; contains the modpack information and dependencies
|
|
4
15
|
* @property dependencies - The dependencies of the modpack
|
|
@@ -6,7 +17,7 @@ import type { DependencyCategory, ModpackInfo } from "./index.js";
|
|
|
6
17
|
* @property [key: string] - Any other properties of the modpack
|
|
7
18
|
*/
|
|
8
19
|
export type Jsonfile = Partial<ModpackInfo> & {
|
|
9
|
-
dependencies?: Partial<Record<DependencyCategory,
|
|
20
|
+
dependencies?: Partial<Record<DependencyCategory, DependencyMap | LegacyDependencyList>>;
|
|
10
21
|
scripts?: {
|
|
11
22
|
[key: string]: string;
|
|
12
23
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Jsonfile.d.ts","sourceRoot":"","sources":["../../src/types/Jsonfile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,kBAAkB,EAAE,WAAW,EAAC,MAAM,YAAY,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG;IAC1C,YAAY,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"Jsonfile.d.ts","sourceRoot":"","sources":["../../src/types/Jsonfile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,kBAAkB,EAAE,WAAW,EAAC,MAAM,YAAY,CAAC;AAEhE;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEnD;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG,MAAM,EAAE,CAAC;AAE5C;;;;;GAKG;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG;IAC1C,YAAY,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,aAAa,GAAG,oBAAoB,CAAC,CAAC,CAAC;IACzF,OAAO,CAAC,EAAE;QACN,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACzB,CAAC;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "modpack-lock",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.8.1",
|
|
4
4
|
"description": "Creates a modpack lockfile for files hosted on Modrinth (mods, resource packs, shaders and datapacks)",
|
|
5
5
|
"bugs": {
|
|
6
6
|
"url": "https://github.com/nickesc/modpack-lock/issues"
|
|
@@ -43,8 +43,7 @@
|
|
|
43
43
|
"dependencies": {
|
|
44
44
|
"@sindresorhus/slugify": "^3.0.0",
|
|
45
45
|
"commander": "^14.0.3",
|
|
46
|
-
"prompts": "^2.4.2"
|
|
47
|
-
"slugify": "^1.6.6"
|
|
46
|
+
"prompts": "^2.4.2"
|
|
48
47
|
},
|
|
49
48
|
"devDependencies": {
|
|
50
49
|
"@eslint/js": "^10.0.1",
|