@push.rocks/smartnpm 2.1.2 → 2.1.4

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.
@@ -0,0 +1,367 @@
1
+ import * as plugins from './smartnpm.plugins.js';
2
+ import { parseIni } from './smartnpm.ini.js';
3
+ import { homeBeforeNpmrc as rcHome } from './smartnpm.npmrc.js';
4
+ /**
5
+ * resolves the registry url from npm configuration when none is configured,
6
+ * the way rc('npm') reads it: defaults < config files < npm_* env < process arguments
7
+ */
8
+ const stripJsonComments = (str) => {
9
+ const strip = (s, start, end) => s.slice(start, end).replace(/\S/g, ' ');
10
+ let insideString = false;
11
+ let insideComment = false;
12
+ let offset = 0;
13
+ let ret = '';
14
+ for (let i = 0; i < str.length; i++) {
15
+ const currentChar = str[i];
16
+ const nextChar = str[i + 1];
17
+ if (!insideComment && currentChar === '"') {
18
+ const escaped = str[i - 1] === '\\' && str[i - 2] !== '\\';
19
+ if (!escaped) {
20
+ insideString = !insideString;
21
+ }
22
+ }
23
+ if (insideString) {
24
+ continue;
25
+ }
26
+ if (!insideComment && currentChar + nextChar === '//') {
27
+ ret += str.slice(offset, i);
28
+ offset = i;
29
+ insideComment = 'single';
30
+ i++;
31
+ }
32
+ else if (insideComment === 'single' && currentChar + nextChar === '\r\n') {
33
+ i++;
34
+ insideComment = false;
35
+ ret += strip(str, offset, i);
36
+ offset = i;
37
+ continue;
38
+ }
39
+ else if (insideComment === 'single' && currentChar === '\n') {
40
+ insideComment = false;
41
+ ret += strip(str, offset, i);
42
+ offset = i;
43
+ }
44
+ else if (!insideComment && currentChar + nextChar === '/*') {
45
+ ret += str.slice(offset, i);
46
+ offset = i;
47
+ insideComment = 'multi';
48
+ i++;
49
+ continue;
50
+ }
51
+ else if (insideComment === 'multi' && currentChar + nextChar === '*/') {
52
+ i++;
53
+ insideComment = false;
54
+ ret += strip(str, offset, i + 1);
55
+ offset = i + 1;
56
+ continue;
57
+ }
58
+ }
59
+ return ret + (insideComment ? strip(str.substr(offset)) : str.substr(offset));
60
+ };
61
+ const parseConfig = (content) => {
62
+ if (/^\s*{/.test(content)) {
63
+ return JSON.parse(stripJsonComments(content));
64
+ }
65
+ return parseIni(content);
66
+ };
67
+ const readConfigFile = (file) => {
68
+ if (file == null || typeof file !== 'string') {
69
+ return undefined;
70
+ }
71
+ try {
72
+ return plugins.fs.readFileSync(plugins.path.join(file), 'utf-8');
73
+ }
74
+ catch {
75
+ return undefined;
76
+ }
77
+ };
78
+ const findUp = (rel) => {
79
+ const find = (start) => {
80
+ const file = plugins.path.join(start, rel);
81
+ try {
82
+ plugins.fs.statSync(file);
83
+ return file;
84
+ }
85
+ catch {
86
+ if (plugins.path.dirname(start) !== start) {
87
+ return find(plugins.path.dirname(start));
88
+ }
89
+ }
90
+ };
91
+ return find(process.cwd());
92
+ };
93
+ const envConfig = (prefix) => {
94
+ const obj = {};
95
+ for (const k in process.env) {
96
+ if (k.toLowerCase().indexOf(prefix.toLowerCase()) !== 0) {
97
+ continue;
98
+ }
99
+ const keypath = k.substring(prefix.length).split('__').filter((subkey) => subkey !== '');
100
+ let cursor = obj;
101
+ keypath.forEach((subkey, i) => {
102
+ if (!subkey || typeof cursor !== 'object') {
103
+ return;
104
+ }
105
+ if (i === keypath.length - 1) {
106
+ cursor[subkey] = process.env[k];
107
+ }
108
+ if (cursor[subkey] === undefined) {
109
+ cursor[subkey] = {};
110
+ }
111
+ cursor = cursor[subkey];
112
+ });
113
+ }
114
+ return obj;
115
+ };
116
+ const isNumber = (x) => {
117
+ if (typeof x === 'number') {
118
+ return true;
119
+ }
120
+ if (/^0x[0-9a-f]+$/i.test(x)) {
121
+ return true;
122
+ }
123
+ return /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(x);
124
+ };
125
+ /**
126
+ * parses process arguments without options (minimist semantics)
127
+ */
128
+ const parseArgv = (argsArg) => {
129
+ let args = argsArg;
130
+ const argv = { _: [] };
131
+ const isConstructorOrProto = (obj, key) => (key === 'constructor' && typeof obj[key] === 'function') || key === '__proto__';
132
+ const setKey = (obj, keys, value) => {
133
+ let o = obj;
134
+ for (let i = 0; i < keys.length - 1; i++) {
135
+ const key = keys[i];
136
+ if (isConstructorOrProto(o, key)) {
137
+ return;
138
+ }
139
+ if (o[key] === undefined) {
140
+ o[key] = {};
141
+ }
142
+ if (o[key] === Object.prototype || o[key] === Number.prototype || o[key] === String.prototype) {
143
+ o[key] = {};
144
+ }
145
+ if (o[key] === Array.prototype) {
146
+ o[key] = [];
147
+ }
148
+ o = o[key];
149
+ }
150
+ const lastKey = keys[keys.length - 1];
151
+ if (isConstructorOrProto(o, lastKey)) {
152
+ return;
153
+ }
154
+ if (o === Object.prototype || o === Number.prototype || o === String.prototype) {
155
+ o = {};
156
+ }
157
+ if (o === Array.prototype) {
158
+ o = [];
159
+ }
160
+ if (o[lastKey] === undefined || typeof o[lastKey] === 'boolean') {
161
+ o[lastKey] = value;
162
+ }
163
+ else if (Array.isArray(o[lastKey])) {
164
+ o[lastKey].push(value);
165
+ }
166
+ else {
167
+ o[lastKey] = [o[lastKey], value];
168
+ }
169
+ };
170
+ const setArg = (key, val) => {
171
+ setKey(argv, key.split('.'), isNumber(val) ? Number(val) : val);
172
+ };
173
+ let notFlags = [];
174
+ if (args.indexOf('--') !== -1) {
175
+ notFlags = args.slice(args.indexOf('--') + 1);
176
+ args = args.slice(0, args.indexOf('--'));
177
+ }
178
+ for (let i = 0; i < args.length; i++) {
179
+ const arg = args[i];
180
+ let key;
181
+ let next;
182
+ if (/^--.+=/.test(arg)) {
183
+ const m = arg.match(/^--([^=]+)=([\s\S]*)$/);
184
+ setArg(m[1], m[2]);
185
+ }
186
+ else if (/^--no-.+/.test(arg)) {
187
+ setArg(arg.match(/^--no-(.+)/)[1], false);
188
+ }
189
+ else if (/^--.+/.test(arg)) {
190
+ key = arg.match(/^--(.+)/)[1];
191
+ next = args[i + 1];
192
+ if (next !== undefined && !/^(-|--)[^-]/.test(next)) {
193
+ setArg(key, next);
194
+ i += 1;
195
+ }
196
+ else if (/^(true|false)$/.test(next)) {
197
+ setArg(key, next === 'true');
198
+ i += 1;
199
+ }
200
+ else {
201
+ setArg(key, true);
202
+ }
203
+ }
204
+ else if (/^-[^-]+/.test(arg)) {
205
+ const letters = arg.slice(1, -1).split('');
206
+ let broken = false;
207
+ for (let j = 0; j < letters.length; j++) {
208
+ next = arg.slice(j + 2);
209
+ if (next === '-') {
210
+ setArg(letters[j], next);
211
+ continue;
212
+ }
213
+ if (/[A-Za-z]/.test(letters[j]) && next[0] === '=') {
214
+ setArg(letters[j], next.slice(1));
215
+ broken = true;
216
+ break;
217
+ }
218
+ if (/[A-Za-z]/.test(letters[j]) && /-?\d+(\.\d*)?(e-?\d+)?$/.test(next)) {
219
+ setArg(letters[j], next);
220
+ broken = true;
221
+ break;
222
+ }
223
+ if (letters[j + 1] && letters[j + 1].match(/\W/)) {
224
+ setArg(letters[j], arg.slice(j + 2));
225
+ broken = true;
226
+ break;
227
+ }
228
+ else {
229
+ setArg(letters[j], true);
230
+ }
231
+ }
232
+ key = arg.slice(-1)[0];
233
+ if (!broken && key !== '-') {
234
+ if (args[i + 1] && !/^(-|--)[^-]/.test(args[i + 1])) {
235
+ setArg(key, args[i + 1]);
236
+ i += 1;
237
+ }
238
+ else if (args[i + 1] && /^(true|false)$/.test(args[i + 1])) {
239
+ setArg(key, args[i + 1] === 'true');
240
+ i += 1;
241
+ }
242
+ else {
243
+ setArg(key, true);
244
+ }
245
+ }
246
+ }
247
+ else {
248
+ argv._.push(!isNumber(arg) ? arg : Number(arg));
249
+ }
250
+ }
251
+ for (const k of notFlags) {
252
+ argv._.push(k);
253
+ }
254
+ return argv;
255
+ };
256
+ const isSpecificValue = (val) => val instanceof Buffer || val instanceof Date || val instanceof RegExp;
257
+ const cloneSpecificValue = (val) => {
258
+ if (val instanceof Buffer) {
259
+ const x = Buffer.alloc(val.length);
260
+ val.copy(x);
261
+ return x;
262
+ }
263
+ else if (val instanceof Date) {
264
+ return new Date(val.getTime());
265
+ }
266
+ else if (val instanceof RegExp) {
267
+ return new RegExp(val);
268
+ }
269
+ throw new Error('Unexpected situation');
270
+ };
271
+ const deepCloneArray = (arr) => {
272
+ const clone = [];
273
+ arr.forEach((item, index) => {
274
+ if (typeof item === 'object' && item !== null) {
275
+ if (Array.isArray(item)) {
276
+ clone[index] = deepCloneArray(item);
277
+ }
278
+ else if (isSpecificValue(item)) {
279
+ clone[index] = cloneSpecificValue(item);
280
+ }
281
+ else {
282
+ clone[index] = deepExtend({}, item);
283
+ }
284
+ }
285
+ else {
286
+ clone[index] = item;
287
+ }
288
+ });
289
+ return clone;
290
+ };
291
+ const deepExtend = (target, ...sources) => {
292
+ const safeGetProperty = (object, property) => property === '__proto__' ? undefined : object[property];
293
+ for (const obj of sources) {
294
+ if (typeof obj !== 'object' || obj === null || Array.isArray(obj)) {
295
+ continue;
296
+ }
297
+ for (const key of Object.keys(obj)) {
298
+ const src = safeGetProperty(target, key);
299
+ const val = safeGetProperty(obj, key);
300
+ if (val === target) {
301
+ continue;
302
+ }
303
+ else if (typeof val !== 'object' || val === null) {
304
+ target[key] = val;
305
+ }
306
+ else if (Array.isArray(val)) {
307
+ target[key] = deepCloneArray(val);
308
+ }
309
+ else if (isSpecificValue(val)) {
310
+ target[key] = cloneSpecificValue(val);
311
+ }
312
+ else if (typeof src !== 'object' || src === null || Array.isArray(src)) {
313
+ target[key] = deepExtend({}, val);
314
+ }
315
+ else {
316
+ target[key] = deepExtend(src, val);
317
+ }
318
+ }
319
+ }
320
+ return target;
321
+ };
322
+ const readNpmRc = () => {
323
+ const name = 'npm';
324
+ const argv = parseArgv(process.argv.slice(2));
325
+ const env = envConfig(name + '_');
326
+ const configs = [{ registry: 'https://registry.npmjs.org/' }];
327
+ const configFiles = [];
328
+ const addConfigFile = (file) => {
329
+ if (configFiles.indexOf(file) >= 0) {
330
+ return;
331
+ }
332
+ const fileConfig = readConfigFile(file);
333
+ if (fileConfig) {
334
+ configs.push(parseConfig(fileConfig));
335
+ configFiles.push(file);
336
+ }
337
+ };
338
+ if (process.platform !== 'win32') {
339
+ addConfigFile(plugins.path.join('/etc', name, 'config'));
340
+ addConfigFile(plugins.path.join('/etc', name + 'rc'));
341
+ }
342
+ if (rcHome) {
343
+ addConfigFile(plugins.path.join(rcHome, '.config', name, 'config'));
344
+ addConfigFile(plugins.path.join(rcHome, '.config', name));
345
+ addConfigFile(plugins.path.join(rcHome, '.' + name, 'config'));
346
+ addConfigFile(plugins.path.join(rcHome, '.' + name + 'rc'));
347
+ }
348
+ addConfigFile(findUp('.' + name + 'rc'));
349
+ if (env.config) {
350
+ addConfigFile(env.config);
351
+ }
352
+ if (argv.config) {
353
+ addConfigFile(argv.config);
354
+ }
355
+ return deepExtend({}, ...configs, env, argv, configFiles.length
356
+ ? { configs: configFiles, config: configFiles[configFiles.length - 1] }
357
+ : undefined);
358
+ };
359
+ /**
360
+ * the registry url npm would use for a package scope, always ending in a slash
361
+ */
362
+ export const getDefaultRegistryUrl = (scope) => {
363
+ const result = readNpmRc();
364
+ const url = result[`${scope}:registry`] || result.config_registry || result.registry;
365
+ return url.slice(-1) === '/' ? url : `${url}/`;
366
+ };
367
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartnpm.registryurl.js","sourceRoot":"","sources":["../ts/smartnpm.registryurl.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@push.rocks/smartnpm",
3
- "version": "2.1.2",
3
+ "version": "2.1.4",
4
4
  "private": false,
5
5
  "description": "A library to interface with npm for retrieving package information and manipulation.",
6
6
  "main": "dist_ts/index.js",
@@ -27,24 +27,23 @@
27
27
  },
28
28
  "homepage": "https://code.foss.global/push.rocks/smartnpm",
29
29
  "devDependencies": {
30
- "@git.zone/tsbuild": "^5.0.0",
31
- "@git.zone/tsrun": "^3.0.2",
32
- "@git.zone/tstest": "^6.3.2",
30
+ "@git.zone/tsbuild": "^6.0.2",
31
+ "@git.zone/tsrun": "^3.0.3",
32
+ "@git.zone/tstest": "^7.2.1",
33
33
  "@types/lodash.clonedeep": "^4.5.9",
34
- "@types/node": "^26.6.2"
34
+ "@types/node": "^26.6.4"
35
35
  },
36
36
  "dependencies": {
37
- "@push.rocks/levelcache": "^3.4.0",
38
- "@push.rocks/smartarchive": "^5.5.1",
37
+ "@push.rocks/levelcache": "^3.5.0",
38
+ "@push.rocks/smartarchive": "^5.5.2",
39
39
  "@push.rocks/smartconsole": "^2.0.0",
40
- "@push.rocks/smartfile": "^13.1.3",
40
+ "@push.rocks/smartfile": "^13.2.2",
41
41
  "@push.rocks/smartfs": "^1.5.1",
42
42
  "@push.rocks/smartpath": "^6.0.0",
43
43
  "@push.rocks/smartpromise": "^4.2.3",
44
44
  "@push.rocks/smartrequest": "^5.0.1",
45
- "@push.rocks/smarttime": "^4.2.3",
46
- "@push.rocks/smartversion": "^3.1.0",
47
- "package-json": "^10.0.1"
45
+ "@push.rocks/smarttime": "^5.0.1",
46
+ "@push.rocks/smartversion": "^3.1.0"
48
47
  },
49
48
  "files": [
50
49
  "ts/**/*",
package/readme.md CHANGED
@@ -243,6 +243,8 @@ new NpmRegistry(options?: INpmRegistryConstructorOptions)
243
243
  Options:
244
244
  - `npmRegistryUrl`: Custom registry URL (default: `https://registry.npmjs.org`)
245
245
 
246
+ Credentials for the registry come from the npm configuration, as npm would send them: `_authToken`, `username`/`_password` or `_auth` entries for the registry url in the project, user or global `.npmrc` or in `npm_config_*` environment variables.
247
+
246
248
  #### Methods
247
249
 
248
250
  ##### `getPackageInfo(packageName: string): Promise<NpmPackage>`
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartnpm',
6
- version: '2.1.2',
6
+ version: '2.1.4',
7
7
  description: 'A library to interface with npm for retrieving package information and manipulation.'
8
8
  }
@@ -7,6 +7,7 @@ import { type ISearchObject } from './smartnpm.interfaces.js';
7
7
  // classes
8
8
  import { NpmPackage } from './smartnpm.classes.npmpackage.js';
9
9
  import { type ICacheDescriptor, RegistryCache } from './smartnpm.classes.registrycache.js';
10
+ import { fetchLatestManifest, fetchPackument } from './smartnpm.packument.js';
10
11
 
11
12
  export interface INpmRegistryConstructorOptions {
12
13
  npmRegistryUrl?: string;
@@ -35,18 +36,15 @@ export class NpmRegistry {
35
36
  * @param packageName
36
37
  */
37
38
  public async getPackageInfo(packageName: string): Promise<NpmPackage> {
38
- const fullMetadata = await plugins
39
- .packageJson.default(packageName, {
40
- registryUrl: this.options.npmRegistryUrl,
41
- fullMetadata: true,
42
- })
43
- .catch((err) => {
44
- console.log(err);
45
- return null;
46
- });
47
- const versionData = await plugins.packageJson.default(packageName, {
39
+ const fullMetadata = await fetchLatestManifest(packageName, {
40
+ registryUrl: this.options.npmRegistryUrl,
41
+ }).catch((err) => {
42
+ console.log(err);
43
+ return null;
44
+ });
45
+ // the abbreviated packument; the full one differs, so it cannot serve both
46
+ const versionData = await fetchPackument(packageName, {
48
47
  registryUrl: this.options.npmRegistryUrl,
49
- allVersions: true,
50
48
  });
51
49
  if (!fullMetadata) {
52
50
  throw new Error(`Could not retrieve metadata for package ${packageName}.`);
@@ -0,0 +1,147 @@
1
+ /**
2
+ * parses ini content the way npm config files are parsed (ini 1.3.8 semantics)
3
+ */
4
+ export const parseIni = (str: string): Record<string, any> => {
5
+ const out: Record<string, any> = {};
6
+ let p = out;
7
+ // section |key = value
8
+ const re = /^\[([^\]]*)\]$|^([^=]+)(=(.*))?$/i;
9
+ const lines = str.split(/[\r\n]+/g);
10
+
11
+ for (const line of lines) {
12
+ if (!line || line.match(/^\s*[;#]/)) {
13
+ continue;
14
+ }
15
+ const match = line.match(re);
16
+ if (!match) {
17
+ continue;
18
+ }
19
+ if (match[1] !== undefined) {
20
+ const section = unsafe(match[1]);
21
+ if (section === '__proto__') {
22
+ // keep parsing the section, but don't attach it
23
+ p = {};
24
+ continue;
25
+ }
26
+ p = out[section] = out[section] || {};
27
+ continue;
28
+ }
29
+ let key = unsafe(match[2]);
30
+ if (key === '__proto__') {
31
+ continue;
32
+ }
33
+ let value: unknown = match[3] ? unsafe(match[4]) : true;
34
+ switch (value) {
35
+ case 'true':
36
+ case 'false':
37
+ case 'null':
38
+ value = JSON.parse(value);
39
+ }
40
+
41
+ // convert keys with '[]' suffix to an array
42
+ if (key.length > 2 && key.slice(-2) === '[]') {
43
+ key = key.substring(0, key.length - 2);
44
+ if (key === '__proto__') {
45
+ continue;
46
+ }
47
+ if (!p[key]) {
48
+ p[key] = [];
49
+ } else if (!Array.isArray(p[key])) {
50
+ p[key] = [p[key]];
51
+ }
52
+ }
53
+
54
+ // safeguard against resetting a previously defined array by forgetting the brackets
55
+ if (Array.isArray(p[key])) {
56
+ p[key].push(value);
57
+ } else {
58
+ p[key] = value;
59
+ }
60
+ }
61
+
62
+ // {a:{y:1},"a.b":{x:2}} --> {a:{y:1,b:{x:2}}}
63
+ const nestedSections = Object.keys(out).filter((k) => {
64
+ if (!out[k] || typeof out[k] !== 'object' || Array.isArray(out[k])) {
65
+ return false;
66
+ }
67
+ // see if the parent section is also an object; if so, add it to that
68
+ const parts = dotSplit(k);
69
+ let target = out;
70
+ const l = parts.pop()!;
71
+ const nl = l.replace(/\\\./g, '.');
72
+ for (const part of parts) {
73
+ if (part === '__proto__') {
74
+ continue;
75
+ }
76
+ if (!target[part] || typeof target[part] !== 'object') {
77
+ target[part] = {};
78
+ }
79
+ target = target[part];
80
+ }
81
+ if (target === out && nl === l) {
82
+ return false;
83
+ }
84
+ target[nl] = out[k];
85
+ return true;
86
+ });
87
+ for (const k of nestedSections) {
88
+ delete out[k];
89
+ }
90
+
91
+ return out;
92
+ };
93
+
94
+ const dotSplit = (str: string): string[] => {
95
+ return str
96
+ .replace(/\u0001/g, '\u0002LITERAL\\1LITERAL\u0002')
97
+ .replace(/\\\./g, '\u0001')
98
+ .split(/\./)
99
+ .map((part) =>
100
+ part.replace(/\u0001/g, '\\.').replace(/\u0002LITERAL\\1LITERAL\u0002/g, '\u0001'),
101
+ );
102
+ };
103
+
104
+ const isQuoted = (val: string): boolean => {
105
+ return (
106
+ (val.charAt(0) === '"' && val.slice(-1) === '"') ||
107
+ (val.charAt(0) === "'" && val.slice(-1) === "'")
108
+ );
109
+ };
110
+
111
+ const unsafe = (valArg: string | undefined): string => {
112
+ let val = (valArg || '').trim();
113
+ if (isQuoted(val)) {
114
+ // remove the single quotes before calling JSON.parse
115
+ if (val.charAt(0) === "'") {
116
+ val = val.substr(1, val.length - 2);
117
+ }
118
+ try {
119
+ val = JSON.parse(val);
120
+ } catch {}
121
+ return val;
122
+ }
123
+ // walk the value to find the first not-escaped ; or # character
124
+ let esc = false;
125
+ let unesc = '';
126
+ for (let i = 0, l = val.length; i < l; i++) {
127
+ const c = val.charAt(i);
128
+ if (esc) {
129
+ if ('\\;#'.indexOf(c) !== -1) {
130
+ unesc += c;
131
+ } else {
132
+ unesc += '\\' + c;
133
+ }
134
+ esc = false;
135
+ } else if (';#'.indexOf(c) !== -1) {
136
+ break;
137
+ } else if (c === '\\') {
138
+ esc = true;
139
+ } else {
140
+ unesc += c;
141
+ }
142
+ }
143
+ if (esc) {
144
+ unesc += '\\';
145
+ }
146
+ return unesc.trim();
147
+ };