@ohos-ports/sharp 0.34.5-beta.8 → 0.35.5-beta.1

package/{lib/is.js → dist/is.cjs}

@@ -78,7 +78,7 @@ const string = (val) => typeof val === 'string' && val.length > 0;
  * Is this value a real number?
  * @private
  */
-const number = (val) => typeof val === 'number' && !Number.isNaN(val);
+const number = (val) => typeof val === 'number' && Number.isFinite(val);
 
 /**
  * Is this value an integer?
@@ -107,9 +107,15 @@ const inArray = (val, list) => list.includes(val);
  * @returns {Error} Containing the formatted message.
  * @private
  */
-const invalidParameterError = (name, expected, actual) => new Error(
-    `Expected ${expected} for ${name} but received ${actual} of type ${typeof actual}`
+const invalidParameterError = (name, expected, actual) => {
+  let actualString;
+  try {
+    actualString = String(actual).slice(0, 100);
+  } catch {}
+  return new Error(
+    `Expected ${expected} for ${name} but received ${actualString} of type ${typeof actual}`
   );
+};
 
 /**
  * Ensures an Error from C++ contains a JS stack.

package/dist/is.mjs

@@ -0,0 +1,149 @@
+/*!
+  Copyright 2013 Lovell Fuller and others.
+  SPDX-License-Identifier: Apache-2.0
+*/
+
+/**
+ * Is this value defined and not null?
+ * @private
+ */
+const defined = (val) => typeof val !== 'undefined' && val !== null;
+
+/**
+ * Is this value an object?
+ * @private
+ */
+const object = (val) => typeof val === 'object';
+
+/**
+ * Is this value a plain object?
+ * @private
+ */
+const plainObject = (val) => Object.prototype.toString.call(val) === '[object Object]';
+
+/**
+ * Is this value a function?
+ * @private
+ */
+const fn = (val) => typeof val === 'function';
+
+/**
+ * Is this value a boolean?
+ * @private
+ */
+const bool = (val) => typeof val === 'boolean';
+
+/**
+ * Is this value a Buffer object?
+ * @private
+ */
+const buffer = (val) => val instanceof Buffer;
+
+/**
+ * Is this value a typed array object?. E.g. Uint8Array or Uint8ClampedArray?
+ * @private
+ */
+const typedArray = (val) => {
+  if (defined(val)) {
+    switch (val.constructor) {
+      case Uint8Array:
+      case Uint8ClampedArray:
+      case Int8Array:
+      case Uint16Array:
+      case Int16Array:
+      case Uint32Array:
+      case Int32Array:
+      case Float32Array:
+      case Float64Array:
+        return true;
+    }
+  }
+
+  return false;
+};
+
+/**
+ * Is this value an ArrayBuffer object?
+ * @private
+ */
+const arrayBuffer = (val) => val instanceof ArrayBuffer;
+
+/**
+ * Is this value a non-empty string?
+ * @private
+ */
+const string = (val) => typeof val === 'string' && val.length > 0;
+
+/**
+ * Is this value a real number?
+ * @private
+ */
+const number = (val) => typeof val === 'number' && Number.isFinite(val);
+
+/**
+ * Is this value an integer?
+ * @private
+ */
+const integer = (val) => Number.isInteger(val);
+
+/**
+ * Is this value within an inclusive given range?
+ * @private
+ */
+const inRange = (val, min, max) => val >= min && val <= max;
+
+/**
+ * Is this value within the elements of an array?
+ * @private
+ */
+const inArray = (val, list) => list.includes(val);
+
+/**
+ * Create an Error with a message relating to an invalid parameter.
+ *
+ * @param {string} name - parameter name.
+ * @param {string} expected - description of the type/value/range expected.
+ * @param {*} actual - the value received.
+ * @returns {Error} Containing the formatted message.
+ * @private
+ */
+const invalidParameterError = (name, expected, actual) => {
+  let actualString;
+  try {
+    actualString = String(actual).slice(0, 100);
+  } catch {}
+  return new Error(
+    `Expected ${expected} for ${name} but received ${actualString} of type ${typeof actual}`
+  );
+};
+
+/**
+ * Ensures an Error from C++ contains a JS stack.
+ *
+ * @param {Error} native - Error with message from C++.
+ * @param {Error} context - Error with stack from JS.
+ * @returns {Error} Error with message and stack.
+ * @private
+ */
+const nativeError = (native, context) => {
+  context.message = native.message;
+  return context;
+};
+
+export default {
+  defined,
+  object,
+  plainObject,
+  fn,
+  bool,
+  buffer,
+  typedArray,
+  arrayBuffer,
+  string,
+  number,
+  integer,
+  inRange,
+  inArray,
+  invalidParameterError,
+  nativeError
+};

package/{lib/libvips.js → dist/libvips.cjs}

@@ -5,20 +5,18 @@
 
 const { spawnSync } = require('node:child_process');
 const { createHash } = require('node:crypto');
-const semverCoerce = require('semver/functions/coerce');
-const semverGreaterThanOrEqualTo = require('semver/functions/gte');
-const semverSatisfies = require('semver/functions/satisfies');
+const semver = require('semver');
 const detectLibc = require('detect-libc');
-
-const { config, engines, optionalDependencies } = require('../package.json');
+const pkg = require('../package.json');
 
 /* node:coverage ignore next */
-const minimumLibvipsVersionLabelled = process.env.npm_package_config_libvips || (config && config.libvips) || '>=8.17.3';
-const minimumLibvipsVersion = semverCoerce(minimumLibvipsVersionLabelled).version;
+const minimumLibvipsVersionLabelled = process.env.npm_package_config_libvips || pkg.config.libvips;
+const minimumLibvipsVersion = semver.coerce(minimumLibvipsVersionLabelled).version;
 
 const prebuiltPlatforms = [
   'darwin-arm64', 'darwin-x64',
-  'linux-arm', 'linux-arm64', 'linux-ppc64', 'linux-riscv64', 'linux-s390x', 'linux-x64',
+  'freebsd-arm64', 'freebsd-x64',
+  'linux-arm', 'linux-arm64', 'linux-ppc64', 'linux-riscv64', 'linux-s390x', 'linux-wasm32', 'linux-x64',
   'linuxmusl-arm64', 'linuxmusl-x64',
   'win32-arm64', 'win32-ia32', 'win32-x64',
   'openharmony-arm64'
@@ -37,13 +35,13 @@ const log = (item) => {
   }
 };
 
-/* node:coverage ignore next */
+/* node:coverage disable */
+
 const runtimeLibc = () => detectLibc.isNonGlibcLinuxSync() ? detectLibc.familySync() : '';
 
 const runtimePlatformArch = () => `${process.platform}${runtimeLibc()}-${process.arch}`;
 
 const buildPlatformArch = () => {
-  /* node:coverage ignore next 3 */
   if (isEmscripten()) {
     return 'wasm32';
   }
@@ -56,7 +54,6 @@ const buildSharpLibvipsIncludeDir = () => {
   try {
     return require(`@img/sharp-libvips-dev-${buildPlatformArch()}/include`);
   } catch {
-    /* node:coverage ignore next 5 */
     try {
       return require('@img/sharp-libvips-dev/include');
     } catch {}
@@ -65,7 +62,6 @@ const buildSharpLibvipsIncludeDir = () => {
 };
 
 const buildSharpLibvipsCPlusPlusDir = () => {
-  /* node:coverage ignore next 4 */
   try {
     return require('@img/sharp-libvips-dev/cplusplus');
   } catch {}
@@ -76,7 +72,6 @@ const buildSharpLibvipsLibDir = () => {
   try {
     return require(`@img/sharp-libvips-dev-${buildPlatformArch()}/lib`);
   } catch {
-    /* node:coverage ignore next 5 */
     try {
       return require(`@img/sharp-libvips-${buildPlatformArch()}/lib`);
     } catch {}
@@ -84,12 +79,10 @@ const buildSharpLibvipsLibDir = () => {
   return '';
 };
 
-/* node:coverage disable */
-
 const isUnsupportedNodeRuntime = () => {
   if (process.release?.name === 'node' && process.versions) {
-    if (!semverSatisfies(process.versions.node, engines.node)) {
-      return { found: process.versions.node, expected: engines.node };
+    if (!semver.satisfies(process.versions.node, pkg.engines.node)) {
+      return { found: process.versions.node, expected: pkg.engines.node };
     }
   }
 };
@@ -114,7 +107,7 @@ const sha512 = (s) => createHash('sha512').update(s).digest('hex');
 const yarnLocator = () => {
   try {
     const identHash = sha512(`imgsharp-libvips-${buildPlatformArch()}`);
-    const npmVersion = semverCoerce(optionalDependencies[`@img/sharp-libvips-${buildPlatformArch()}`], {
+    const npmVersion = semver.coerce(pkg.optionalDependencies[`@img/sharp-libvips-${buildPlatformArch()}`], {
       includePrerelease: true
     }).version;
     return sha512(`${identHash}npm:${npmVersion}`).slice(0, 10);
@@ -145,22 +138,34 @@ const globalLibvipsVersion = () => {
   }
 };
 
+const getBrewPkgConfigPath = () => {
+  try {
+    const brewPrefix = (spawnSync('brew', ['--prefix'], { encoding: 'utf8' }).stdout || '').trim();
+    if (brewPrefix) {
+      return `${brewPrefix}/lib/pkgconfig`;
+    }
+  } catch (_err) {}
+  return undefined;
+};
+
+const getPkgConfigPath = () => {
+  try {
+    const pkgConfigPath = (spawnSync('pkg-config', ['--variable', 'pc_path', 'pkg-config'], { encoding: 'utf8' }).stdout || '').trim();
+    if (pkgConfigPath) {
+      return pkgConfigPath;
+    }
+  } catch (_err) {}
+  return undefined;
+};
+
 /* node:coverage enable */
 
 const pkgConfigPath = () => {
   if (process.platform !== 'win32') {
-    /* node:coverage ignore next 4 */
-    const brewPkgConfigPath = spawnSync(
-      'which brew >/dev/null 2>&1 && brew environment --plain | grep PKG_CONFIG_LIBDIR | cut -d" " -f2',
-      spawnSyncOptions
-    ).stdout || '';
     return [
-      brewPkgConfigPath.trim(),
-      process.env.PKG_CONFIG_PATH,
-      '/usr/local/lib/pkgconfig',
-      '/usr/lib/pkgconfig',
-      '/usr/local/libdata/pkgconfig',
-      '/usr/libdata/pkgconfig'
+      getBrewPkgConfigPath(),
+      getPkgConfigPath(),
+      process.env.PKG_CONFIG_PATH
     ].filter(Boolean).join(':');
   } else {
     return '';
@@ -187,7 +192,7 @@ const useGlobalLibvips = (logger) => {
   }
   const globalVipsVersion = globalLibvipsVersion();
   /* node:coverage ignore next */
-  return !!globalVipsVersion && semverGreaterThanOrEqualTo(globalVipsVersion, minimumLibvipsVersion);
+  return !!globalVipsVersion && semver.gte(globalVipsVersion, minimumLibvipsVersion);
 };
 
 module.exports = {

package/dist/libvips.mjs

@@ -0,0 +1,213 @@
+/*!
+  Copyright 2013 Lovell Fuller and others.
+  SPDX-License-Identifier: Apache-2.0
+*/
+
+import { spawnSync } from 'node:child_process';
+import { createHash } from 'node:crypto';
+import semver from 'semver';
+import detectLibc from 'detect-libc';
+import pkg from '../package.json' with { type: 'json' };
+
+/* node:coverage ignore next */
+const minimumLibvipsVersionLabelled = process.env.npm_package_config_libvips || pkg.config.libvips;
+const minimumLibvipsVersion = semver.coerce(minimumLibvipsVersionLabelled).version;
+
+const prebuiltPlatforms = [
+  'darwin-arm64', 'darwin-x64',
+  'freebsd-arm64', 'freebsd-x64',
+  'linux-arm', 'linux-arm64', 'linux-ppc64', 'linux-riscv64', 'linux-s390x', 'linux-wasm32', 'linux-x64',
+  'linuxmusl-arm64', 'linuxmusl-x64',
+  'win32-arm64', 'win32-ia32', 'win32-x64',
+  'openharmony-arm64'
+];
+
+const spawnSyncOptions = {
+  encoding: 'utf8',
+  shell: true
+};
+
+const log = (item) => {
+  if (item instanceof Error) {
+    console.error(`sharp: Installation error: ${item.message}`);
+  } else {
+    console.log(`sharp: ${item}`);
+  }
+};
+
+/* node:coverage disable */
+
+const runtimeLibc = () => detectLibc.isNonGlibcLinuxSync() ? detectLibc.familySync() : '';
+
+const runtimePlatformArch = () => `${process.platform}${runtimeLibc()}-${process.arch}`;
+
+const buildPlatformArch = () => {
+  if (isEmscripten()) {
+    return 'wasm32';
+  }
+  const { npm_config_arch, npm_config_platform, npm_config_libc } = process.env;
+  const libc = typeof npm_config_libc === 'string' ? npm_config_libc : runtimeLibc();
+  return `${npm_config_platform || process.platform}${libc}-${npm_config_arch || process.arch}`;
+};
+
+const buildSharpLibvipsIncludeDir = () => {
+  try {
+    return require(`@img/sharp-libvips-dev-${buildPlatformArch()}/include`);
+  } catch {
+    try {
+      return require('@img/sharp-libvips-dev/include');
+    } catch {}
+  }
+  return '';
+};
+
+const buildSharpLibvipsCPlusPlusDir = () => {
+  try {
+    return require('@img/sharp-libvips-dev/cplusplus');
+  } catch {}
+  return '';
+};
+
+const buildSharpLibvipsLibDir = () => {
+  try {
+    return require(`@img/sharp-libvips-dev-${buildPlatformArch()}/lib`);
+  } catch {
+    try {
+      return require(`@img/sharp-libvips-${buildPlatformArch()}/lib`);
+    } catch {}
+  }
+  return '';
+};
+
+const isUnsupportedNodeRuntime = () => {
+  if (process.release?.name === 'node' && process.versions) {
+    if (!semver.satisfies(process.versions.node, pkg.engines.node)) {
+      return { found: process.versions.node, expected: pkg.engines.node };
+    }
+  }
+};
+
+const isEmscripten = () => {
+  const { CC } = process.env;
+  return Boolean(CC?.endsWith('/emcc'));
+};
+
+const isRosetta = () => {
+  if (process.platform === 'darwin' && process.arch === 'x64') {
+    const translated = spawnSync('sysctl sysctl.proc_translated', spawnSyncOptions).stdout;
+    return (translated || '').trim() === 'sysctl.proc_translated: 1';
+  }
+  return false;
+};
+
+/* node:coverage enable */
+
+const sha512 = (s) => createHash('sha512').update(s).digest('hex');
+
+const yarnLocator = () => {
+  try {
+    const identHash = sha512(`imgsharp-libvips-${buildPlatformArch()}`);
+    const npmVersion = semver.coerce(pkg.optionalDependencies[`@img/sharp-libvips-${buildPlatformArch()}`], {
+      includePrerelease: true
+    }).version;
+    return sha512(`${identHash}npm:${npmVersion}`).slice(0, 10);
+  } catch {}
+  return '';
+};
+
+/* node:coverage disable */
+
+const spawnRebuild = () =>
+  spawnSync(`node-gyp rebuild --directory=src ${isEmscripten() ? '--nodedir=emscripten' : ''}`, {
+    ...spawnSyncOptions,
+    stdio: 'inherit'
+  }).status;
+
+const globalLibvipsVersion = () => {
+  if (process.platform !== 'win32') {
+    const globalLibvipsVersion = spawnSync('pkg-config --modversion vips-cpp', {
+      ...spawnSyncOptions,
+      env: {
+        ...process.env,
+        PKG_CONFIG_PATH: pkgConfigPath()
+      }
+    }).stdout;
+    return (globalLibvipsVersion || '').trim();
+  } else {
+    return '';
+  }
+};
+
+const getBrewPkgConfigPath = () => {
+  try {
+    const brewPrefix = (spawnSync('brew', ['--prefix'], { encoding: 'utf8' }).stdout || '').trim();
+    if (brewPrefix) {
+      return `${brewPrefix}/lib/pkgconfig`;
+    }
+  } catch (_err) {}
+  return undefined;
+};
+
+const getPkgConfigPath = () => {
+  try {
+    const pkgConfigPath = (spawnSync('pkg-config', ['--variable', 'pc_path', 'pkg-config'], { encoding: 'utf8' }).stdout || '').trim();
+    if (pkgConfigPath) {
+      return pkgConfigPath;
+    }
+  } catch (_err) {}
+  return undefined;
+};
+
+/* node:coverage enable */
+
+const pkgConfigPath = () => {
+  if (process.platform !== 'win32') {
+    return [
+      getBrewPkgConfigPath(),
+      getPkgConfigPath(),
+      process.env.PKG_CONFIG_PATH
+    ].filter(Boolean).join(':');
+  } else {
+    return '';
+  }
+};
+
+const skipSearch = (status, reason, logger) => {
+  if (logger) {
+    logger(`Detected ${reason}, skipping search for globally-installed libvips`);
+  }
+  return status;
+};
+
+const useGlobalLibvips = (logger) => {
+  if (Boolean(process.env.SHARP_IGNORE_GLOBAL_LIBVIPS) === true) {
+    return skipSearch(false, 'SHARP_IGNORE_GLOBAL_LIBVIPS', logger);
+  }
+  if (Boolean(process.env.SHARP_FORCE_GLOBAL_LIBVIPS) === true) {
+    return skipSearch(true, 'SHARP_FORCE_GLOBAL_LIBVIPS', logger);
+  }
+  /* node:coverage ignore next 3 */
+  if (isRosetta()) {
+    return skipSearch(false, 'Rosetta', logger);
+  }
+  const globalVipsVersion = globalLibvipsVersion();
+  /* node:coverage ignore next */
+  return !!globalVipsVersion && semver.gte(globalVipsVersion, minimumLibvipsVersion);
+};
+
+export default {
+  minimumLibvipsVersion,
+  prebuiltPlatforms,
+  buildPlatformArch,
+  buildSharpLibvipsIncludeDir,
+  buildSharpLibvipsCPlusPlusDir,
+  buildSharpLibvipsLibDir,
+  isUnsupportedNodeRuntime,
+  runtimePlatformArch,
+  log,
+  yarnLocator,
+  spawnRebuild,
+  globalLibvipsVersion,
+  pkgConfigPath,
+  useGlobalLibvips
+};