@push.rocks/smartnpm 2.1.3 → 2.1.4

package/dist_ts/smartnpm.registryurl.js

@@ -0,0 +1,367 @@
+import * as plugins from './smartnpm.plugins.js';
+import { parseIni } from './smartnpm.ini.js';
+import { homeBeforeNpmrc as rcHome } from './smartnpm.npmrc.js';
+/**
+ * resolves the registry url from npm configuration when none is configured,
+ * the way rc('npm') reads it: defaults < config files < npm_* env < process arguments
+ */
+const stripJsonComments = (str) => {
+    const strip = (s, start, end) => s.slice(start, end).replace(/\S/g, ' ');
+    let insideString = false;
+    let insideComment = false;
+    let offset = 0;
+    let ret = '';
+    for (let i = 0; i < str.length; i++) {
+        const currentChar = str[i];
+        const nextChar = str[i + 1];
+        if (!insideComment && currentChar === '"') {
+            const escaped = str[i - 1] === '\\' && str[i - 2] !== '\\';
+            if (!escaped) {
+                insideString = !insideString;
+            }
+        }
+        if (insideString) {
+            continue;
+        }
+        if (!insideComment && currentChar + nextChar === '//') {
+            ret += str.slice(offset, i);
+            offset = i;
+            insideComment = 'single';
+            i++;
+        }
+        else if (insideComment === 'single' && currentChar + nextChar === '\r\n') {
+            i++;
+            insideComment = false;
+            ret += strip(str, offset, i);
+            offset = i;
+            continue;
+        }
+        else if (insideComment === 'single' && currentChar === '\n') {
+            insideComment = false;
+            ret += strip(str, offset, i);
+            offset = i;
+        }
+        else if (!insideComment && currentChar + nextChar === '/*') {
+            ret += str.slice(offset, i);
+            offset = i;
+            insideComment = 'multi';
+            i++;
+            continue;
+        }
+        else if (insideComment === 'multi' && currentChar + nextChar === '*/') {
+            i++;
+            insideComment = false;
+            ret += strip(str, offset, i + 1);
+            offset = i + 1;
+            continue;
+        }
+    }
+    return ret + (insideComment ? strip(str.substr(offset)) : str.substr(offset));
+};
+const parseConfig = (content) => {
+    if (/^\s*{/.test(content)) {
+        return JSON.parse(stripJsonComments(content));
+    }
+    return parseIni(content);
+};
+const readConfigFile = (file) => {
+    if (file == null || typeof file !== 'string') {
+        return undefined;
+    }
+    try {
+        return plugins.fs.readFileSync(plugins.path.join(file), 'utf-8');
+    }
+    catch {
+        return undefined;
+    }
+};
+const findUp = (rel) => {
+    const find = (start) => {
+        const file = plugins.path.join(start, rel);
+        try {
+            plugins.fs.statSync(file);
+            return file;
+        }
+        catch {
+            if (plugins.path.dirname(start) !== start) {
+                return find(plugins.path.dirname(start));
+            }
+        }
+    };
+    return find(process.cwd());
+};
+const envConfig = (prefix) => {
+    const obj = {};
+    for (const k in process.env) {
+        if (k.toLowerCase().indexOf(prefix.toLowerCase()) !== 0) {
+            continue;
+        }
+        const keypath = k.substring(prefix.length).split('__').filter((subkey) => subkey !== '');
+        let cursor = obj;
+        keypath.forEach((subkey, i) => {
+            if (!subkey || typeof cursor !== 'object') {
+                return;
+            }
+            if (i === keypath.length - 1) {
+                cursor[subkey] = process.env[k];
+            }
+            if (cursor[subkey] === undefined) {
+                cursor[subkey] = {};
+            }
+            cursor = cursor[subkey];
+        });
+    }
+    return obj;
+};
+const isNumber = (x) => {
+    if (typeof x === 'number') {
+        return true;
+    }
+    if (/^0x[0-9a-f]+$/i.test(x)) {
+        return true;
+    }
+    return /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(x);
+};
+/**
+ * parses process arguments without options (minimist semantics)
+ */
+const parseArgv = (argsArg) => {
+    let args = argsArg;
+    const argv = { _: [] };
+    const isConstructorOrProto = (obj, key) => (key === 'constructor' && typeof obj[key] === 'function') || key === '__proto__';
+    const setKey = (obj, keys, value) => {
+        let o = obj;
+        for (let i = 0; i < keys.length - 1; i++) {
+            const key = keys[i];
+            if (isConstructorOrProto(o, key)) {
+                return;
+            }
+            if (o[key] === undefined) {
+                o[key] = {};
+            }
+            if (o[key] === Object.prototype || o[key] === Number.prototype || o[key] === String.prototype) {
+                o[key] = {};
+            }
+            if (o[key] === Array.prototype) {
+                o[key] = [];
+            }
+            o = o[key];
+        }
+        const lastKey = keys[keys.length - 1];
+        if (isConstructorOrProto(o, lastKey)) {
+            return;
+        }
+        if (o === Object.prototype || o === Number.prototype || o === String.prototype) {
+            o = {};
+        }
+        if (o === Array.prototype) {
+            o = [];
+        }
+        if (o[lastKey] === undefined || typeof o[lastKey] === 'boolean') {
+            o[lastKey] = value;
+        }
+        else if (Array.isArray(o[lastKey])) {
+            o[lastKey].push(value);
+        }
+        else {
+            o[lastKey] = [o[lastKey], value];
+        }
+    };
+    const setArg = (key, val) => {
+        setKey(argv, key.split('.'), isNumber(val) ? Number(val) : val);
+    };
+    let notFlags = [];
+    if (args.indexOf('--') !== -1) {
+        notFlags = args.slice(args.indexOf('--') + 1);
+        args = args.slice(0, args.indexOf('--'));
+    }
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        let key;
+        let next;
+        if (/^--.+=/.test(arg)) {
+            const m = arg.match(/^--([^=]+)=([\s\S]*)$/);
+            setArg(m[1], m[2]);
+        }
+        else if (/^--no-.+/.test(arg)) {
+            setArg(arg.match(/^--no-(.+)/)[1], false);
+        }
+        else if (/^--.+/.test(arg)) {
+            key = arg.match(/^--(.+)/)[1];
+            next = args[i + 1];
+            if (next !== undefined && !/^(-|--)[^-]/.test(next)) {
+                setArg(key, next);
+                i += 1;
+            }
+            else if (/^(true|false)$/.test(next)) {
+                setArg(key, next === 'true');
+                i += 1;
+            }
+            else {
+                setArg(key, true);
+            }
+        }
+        else if (/^-[^-]+/.test(arg)) {
+            const letters = arg.slice(1, -1).split('');
+            let broken = false;
+            for (let j = 0; j < letters.length; j++) {
+                next = arg.slice(j + 2);
+                if (next === '-') {
+                    setArg(letters[j], next);
+                    continue;
+                }
+                if (/[A-Za-z]/.test(letters[j]) && next[0] === '=') {
+                    setArg(letters[j], next.slice(1));
+                    broken = true;
+                    break;
+                }
+                if (/[A-Za-z]/.test(letters[j]) && /-?\d+(\.\d*)?(e-?\d+)?$/.test(next)) {
+                    setArg(letters[j], next);
+                    broken = true;
+                    break;
+                }
+                if (letters[j + 1] && letters[j + 1].match(/\W/)) {
+                    setArg(letters[j], arg.slice(j + 2));
+                    broken = true;
+                    break;
+                }
+                else {
+                    setArg(letters[j], true);
+                }
+            }
+            key = arg.slice(-1)[0];
+            if (!broken && key !== '-') {
+                if (args[i + 1] && !/^(-|--)[^-]/.test(args[i + 1])) {
+                    setArg(key, args[i + 1]);
+                    i += 1;
+                }
+                else if (args[i + 1] && /^(true|false)$/.test(args[i + 1])) {
+                    setArg(key, args[i + 1] === 'true');
+                    i += 1;
+                }
+                else {
+                    setArg(key, true);
+                }
+            }
+        }
+        else {
+            argv._.push(!isNumber(arg) ? arg : Number(arg));
+        }
+    }
+    for (const k of notFlags) {
+        argv._.push(k);
+    }
+    return argv;
+};
+const isSpecificValue = (val) => val instanceof Buffer || val instanceof Date || val instanceof RegExp;
+const cloneSpecificValue = (val) => {
+    if (val instanceof Buffer) {
+        const x = Buffer.alloc(val.length);
+        val.copy(x);
+        return x;
+    }
+    else if (val instanceof Date) {
+        return new Date(val.getTime());
+    }
+    else if (val instanceof RegExp) {
+        return new RegExp(val);
+    }
+    throw new Error('Unexpected situation');
+};
+const deepCloneArray = (arr) => {
+    const clone = [];
+    arr.forEach((item, index) => {
+        if (typeof item === 'object' && item !== null) {
+            if (Array.isArray(item)) {
+                clone[index] = deepCloneArray(item);
+            }
+            else if (isSpecificValue(item)) {
+                clone[index] = cloneSpecificValue(item);
+            }
+            else {
+                clone[index] = deepExtend({}, item);
+            }
+        }
+        else {
+            clone[index] = item;
+        }
+    });
+    return clone;
+};
+const deepExtend = (target, ...sources) => {
+    const safeGetProperty = (object, property) => property === '__proto__' ? undefined : object[property];
+    for (const obj of sources) {
+        if (typeof obj !== 'object' || obj === null || Array.isArray(obj)) {
+            continue;
+        }
+        for (const key of Object.keys(obj)) {
+            const src = safeGetProperty(target, key);
+            const val = safeGetProperty(obj, key);
+            if (val === target) {
+                continue;
+            }
+            else if (typeof val !== 'object' || val === null) {
+                target[key] = val;
+            }
+            else if (Array.isArray(val)) {
+                target[key] = deepCloneArray(val);
+            }
+            else if (isSpecificValue(val)) {
+                target[key] = cloneSpecificValue(val);
+            }
+            else if (typeof src !== 'object' || src === null || Array.isArray(src)) {
+                target[key] = deepExtend({}, val);
+            }
+            else {
+                target[key] = deepExtend(src, val);
+            }
+        }
+    }
+    return target;
+};
+const readNpmRc = () => {
+    const name = 'npm';
+    const argv = parseArgv(process.argv.slice(2));
+    const env = envConfig(name + '_');
+    const configs = [{ registry: 'https://registry.npmjs.org/' }];
+    const configFiles = [];
+    const addConfigFile = (file) => {
+        if (configFiles.indexOf(file) >= 0) {
+            return;
+        }
+        const fileConfig = readConfigFile(file);
+        if (fileConfig) {
+            configs.push(parseConfig(fileConfig));
+            configFiles.push(file);
+        }
+    };
+    if (process.platform !== 'win32') {
+        addConfigFile(plugins.path.join('/etc', name, 'config'));
+        addConfigFile(plugins.path.join('/etc', name + 'rc'));
+    }
+    if (rcHome) {
+        addConfigFile(plugins.path.join(rcHome, '.config', name, 'config'));
+        addConfigFile(plugins.path.join(rcHome, '.config', name));
+        addConfigFile(plugins.path.join(rcHome, '.' + name, 'config'));
+        addConfigFile(plugins.path.join(rcHome, '.' + name + 'rc'));
+    }
+    addConfigFile(findUp('.' + name + 'rc'));
+    if (env.config) {
+        addConfigFile(env.config);
+    }
+    if (argv.config) {
+        addConfigFile(argv.config);
+    }
+    return deepExtend({}, ...configs, env, argv, configFiles.length
+        ? { configs: configFiles, config: configFiles[configFiles.length - 1] }
+        : undefined);
+};
+/**
+ * the registry url npm would use for a package scope, always ending in a slash
+ */
+export const getDefaultRegistryUrl = (scope) => {
+    const result = readNpmRc();
+    const url = result[`${scope}:registry`] || result.config_registry || result.registry;
+    return url.slice(-1) === '/' ? url : `${url}/`;
+};
+//# 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

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartnpm",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "private": false,
   "description": "A library to interface with npm for retrieving package information and manipulation.",
   "main": "dist_ts/index.js",
@@ -27,11 +27,11 @@
   },
   "homepage": "https://code.foss.global/push.rocks/smartnpm",
   "devDependencies": {
-    "@git.zone/tsbuild": "^5.1.2",
-    "@git.zone/tsrun": "^3.0.2",
-    "@git.zone/tstest": "^7.0.0",
+    "@git.zone/tsbuild": "^6.0.2",
+    "@git.zone/tsrun": "^3.0.3",
+    "@git.zone/tstest": "^7.2.1",
     "@types/lodash.clonedeep": "^4.5.9",
-    "@types/node": "^26.6.3"
+    "@types/node": "^26.6.4"
   },
   "dependencies": {
     "@push.rocks/levelcache": "^3.5.0",
@@ -43,8 +43,7 @@
     "@push.rocks/smartpromise": "^4.2.3",
     "@push.rocks/smartrequest": "^5.0.1",
     "@push.rocks/smarttime": "^5.0.1",
-    "@push.rocks/smartversion": "^3.1.0",
-    "package-json": "^10.0.1"
+    "@push.rocks/smartversion": "^3.1.0"
   },
   "files": [
     "ts/**/*",

package/readme.md

@@ -243,6 +243,8 @@ new NpmRegistry(options?: INpmRegistryConstructorOptions)
 Options:
 - `npmRegistryUrl`: Custom registry URL (default: `https://registry.npmjs.org`)
 
+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.
+
 #### Methods
 
 ##### `getPackageInfo(packageName: string): Promise<NpmPackage>`

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartnpm',
-  version: '2.1.3',
+  version: '2.1.4',
   description: 'A library to interface with npm for retrieving package information and manipulation.'
 }

package/ts/smartnpm.classes.npmregistry.ts

@@ -7,6 +7,7 @@ import { type ISearchObject } from './smartnpm.interfaces.js';
 // classes
 import { NpmPackage } from './smartnpm.classes.npmpackage.js';
 import { type ICacheDescriptor, RegistryCache } from './smartnpm.classes.registrycache.js';
+import { fetchLatestManifest, fetchPackument } from './smartnpm.packument.js';
 
 export interface INpmRegistryConstructorOptions {
   npmRegistryUrl?: string;
@@ -35,18 +36,15 @@ export class NpmRegistry {
    * @param packageName
    */
   public async getPackageInfo(packageName: string): Promise<NpmPackage> {
-    const fullMetadata = await plugins
-      .packageJson.default(packageName, {
-        registryUrl: this.options.npmRegistryUrl,
-        fullMetadata: true,
-      })
-      .catch((err) => {
-        console.log(err);
-        return null;
-      });
-    const versionData = await plugins.packageJson.default(packageName, {
+    const fullMetadata = await fetchLatestManifest(packageName, {
+      registryUrl: this.options.npmRegistryUrl,
+    }).catch((err) => {
+      console.log(err);
+      return null;
+    });
+    // the abbreviated packument; the full one differs, so it cannot serve both
+    const versionData = await fetchPackument(packageName, {
       registryUrl: this.options.npmRegistryUrl,
-      allVersions: true,
     });
     if (!fullMetadata) {
       throw new Error(`Could not retrieve metadata for package ${packageName}.`);

package/ts/smartnpm.ini.ts

@@ -0,0 +1,147 @@
+/**
+ * parses ini content the way npm config files are parsed (ini 1.3.8 semantics)
+ */
+export const parseIni = (str: string): Record<string, any> => {
+  const out: Record<string, any> = {};
+  let p = out;
+  //          section     |key      = value
+  const re = /^\[([^\]]*)\]$|^([^=]+)(=(.*))?$/i;
+  const lines = str.split(/[\r\n]+/g);
+
+  for (const line of lines) {
+    if (!line || line.match(/^\s*[;#]/)) {
+      continue;
+    }
+    const match = line.match(re);
+    if (!match) {
+      continue;
+    }
+    if (match[1] !== undefined) {
+      const section = unsafe(match[1]);
+      if (section === '__proto__') {
+        // keep parsing the section, but don't attach it
+        p = {};
+        continue;
+      }
+      p = out[section] = out[section] || {};
+      continue;
+    }
+    let key = unsafe(match[2]);
+    if (key === '__proto__') {
+      continue;
+    }
+    let value: unknown = match[3] ? unsafe(match[4]) : true;
+    switch (value) {
+      case 'true':
+      case 'false':
+      case 'null':
+        value = JSON.parse(value);
+    }
+
+    // convert keys with '[]' suffix to an array
+    if (key.length > 2 && key.slice(-2) === '[]') {
+      key = key.substring(0, key.length - 2);
+      if (key === '__proto__') {
+        continue;
+      }
+      if (!p[key]) {
+        p[key] = [];
+      } else if (!Array.isArray(p[key])) {
+        p[key] = [p[key]];
+      }
+    }
+
+    // safeguard against resetting a previously defined array by forgetting the brackets
+    if (Array.isArray(p[key])) {
+      p[key].push(value);
+    } else {
+      p[key] = value;
+    }
+  }
+
+  // {a:{y:1},"a.b":{x:2}} --> {a:{y:1,b:{x:2}}}
+  const nestedSections = Object.keys(out).filter((k) => {
+    if (!out[k] || typeof out[k] !== 'object' || Array.isArray(out[k])) {
+      return false;
+    }
+    // see if the parent section is also an object; if so, add it to that
+    const parts = dotSplit(k);
+    let target = out;
+    const l = parts.pop()!;
+    const nl = l.replace(/\\\./g, '.');
+    for (const part of parts) {
+      if (part === '__proto__') {
+        continue;
+      }
+      if (!target[part] || typeof target[part] !== 'object') {
+        target[part] = {};
+      }
+      target = target[part];
+    }
+    if (target === out && nl === l) {
+      return false;
+    }
+    target[nl] = out[k];
+    return true;
+  });
+  for (const k of nestedSections) {
+    delete out[k];
+  }
+
+  return out;
+};
+
+const dotSplit = (str: string): string[] => {
+  return str
+    .replace(/\u0001/g, '\u0002LITERAL\\1LITERAL\u0002')
+    .replace(/\\\./g, '\u0001')
+    .split(/\./)
+    .map((part) =>
+      part.replace(/\u0001/g, '\\.').replace(/\u0002LITERAL\\1LITERAL\u0002/g, '\u0001'),
+    );
+};
+
+const isQuoted = (val: string): boolean => {
+  return (
+    (val.charAt(0) === '"' && val.slice(-1) === '"') ||
+    (val.charAt(0) === "'" && val.slice(-1) === "'")
+  );
+};
+
+const unsafe = (valArg: string | undefined): string => {
+  let val = (valArg || '').trim();
+  if (isQuoted(val)) {
+    // remove the single quotes before calling JSON.parse
+    if (val.charAt(0) === "'") {
+      val = val.substr(1, val.length - 2);
+    }
+    try {
+      val = JSON.parse(val);
+    } catch {}
+    return val;
+  }
+  // walk the value to find the first not-escaped ; or # character
+  let esc = false;
+  let unesc = '';
+  for (let i = 0, l = val.length; i < l; i++) {
+    const c = val.charAt(i);
+    if (esc) {
+      if ('\\;#'.indexOf(c) !== -1) {
+        unesc += c;
+      } else {
+        unesc += '\\' + c;
+      }
+      esc = false;
+    } else if (';#'.indexOf(c) !== -1) {
+      break;
+    } else if (c === '\\') {
+      esc = true;
+    } else {
+      unesc += c;
+    }
+  }
+  if (esc) {
+    unesc += '\\';
+  }
+  return unesc.trim();
+};