cabloy 5.1.95 → 5.1.96

package/vona/packages-vona/vona-core/src/lib/addon/addon.ts

@@ -0,0 +1,77 @@
+import fse from 'fs-extra';
+import { createRequire } from 'node:module';
+import path from 'node:path';
+
+import { resolverSharp, resolverSharpLibvips } from './sharp.ts';
+import { resolverSqlite3 } from './sqlite3.ts';
+
+export type TypeCopyAddonOptionsResolver = (addonName: string, projectPath: string) => string;
+export interface ICopyAddonOptions {
+  addonName: string;
+  resolver?: TypeCopyAddonOptionsResolver;
+  projectPath: string;
+  outDir: string;
+  env: NodeJS.ProcessEnv;
+}
+
+export function getPlatformArch() {
+  const platform = process.platform;
+  const arch = process.arch;
+  return `${platform}-${arch}`;
+}
+
+export async function copyAddon({
+  addonName,
+  resolver,
+  projectPath,
+  outDir,
+  env,
+}: ICopyAddonOptions) {
+  const envName = `BUILD_ADDON_${addonName}`.toUpperCase();
+  const envValue = env[envName];
+  if (envValue === 'false') return;
+  // manual
+  const addonDirSrc = path.join(projectPath, 'src/backend/addon', addonName);
+  if (fse.existsSync(addonDirSrc)) {
+    const addonDirDest = path.join(outDir, 'addon', addonName);
+    await fse.copy(addonDirSrc, addonDirDest);
+  }
+  // auto
+  const envAutoName = `BUILD_ADDON_AUTO_${addonName}`.toUpperCase();
+  const envAutoValue = env[envAutoName];
+  if (envAutoValue === 'false') return;
+  const platformArch = getPlatformArch();
+  const addonFile = _resolverAddonFile(addonName, projectPath, resolver);
+  if (addonFile) {
+    const fileDest = path.join(outDir, 'addon', addonName, `${platformArch}.node`);
+    await fse.copy(addonFile, fileDest);
+  }
+}
+
+export function requireAddon(addonName: string) {
+  const addonFile = resolveAddon(addonName);
+  const require = createRequire(import.meta.url);
+  return require(addonFile);
+}
+
+export function resolveAddon(addonName: string) {
+  const platformArch = getPlatformArch();
+  const addonFile = path.join(import.meta.dirname, 'addon', addonName, `${platformArch}.node`);
+  return addonFile;
+}
+
+function _resolverAddonFile(
+  addonName: string,
+  projectPath: string,
+  resolver?: TypeCopyAddonOptionsResolver,
+): string | undefined {
+  const addonFile = resolver?.(addonName, projectPath);
+  if (addonFile) return addonFile;
+  if (addonName === 'sqlite3') {
+    return resolverSqlite3(projectPath);
+  } else if (addonName === 'sharp') {
+    return resolverSharp(projectPath);
+  } else if (addonName === 'sharpLibvips') {
+    return resolverSharpLibvips(projectPath);
+  }
+}

package/vona/packages-vona/vona-core/src/lib/addon/index.ts

@@ -0,0 +1,3 @@
+export * from './sqlite3.ts';
+export * from './addon.ts';
+export * from './sharp.ts';

package/vona/packages-vona/vona-core/src/lib/addon/sharp.ts

@@ -0,0 +1,46 @@
+import fs from 'node:fs';
+import { createRequire } from 'node:module';
+import path from 'node:path';
+import { getPlatformArch } from 'vona';
+
+import { pathToHref } from '../utils/util.ts';
+
+export function resolverSharp(projectPath: string) {
+  // src
+  const require = createRequire(pathToHref(path.join(projectPath, '/')));
+  const sharpPath = require.resolve('sharp');
+  const requireSharp = createRequire(pathToHref(sharpPath));
+  const modulePath = requireSharp.resolve(`@img/sharp-${getPlatformArch()}/sharp.node`);
+  const libPath = path.join(path.dirname(modulePath), 'lib');
+  const fileName = fs.readdirSync(libPath).find(item => item.endsWith('.node'));
+  if (!fileName) {
+    throw new Error(`Sharp native binding not found: ${libPath}`);
+  }
+  return path.join(libPath, fileName);
+}
+
+export function resolverSharpLibvips(projectPath: string) {
+  // src
+  const require = createRequire(pathToHref(path.join(projectPath, '/')));
+  const sharpPath = require.resolve('sharp');
+  const requireSharp = createRequire(pathToHref(sharpPath));
+  const modulePath = requireSharp.resolve(`@img/sharp-libvips-${getPlatformArch()}/package`);
+  const libPath = path.join(path.dirname(modulePath), 'lib');
+  const fileName = fs.readdirSync(libPath).find(_matchSharpLibvipsFileName);
+  if (!fileName) {
+    // eslint-disable-next-line
+    console.log(fs.readdirSync(libPath));
+    throw new Error(`Sharp libvips native binding not found: ${libPath}`);
+  }
+  return path.join(libPath, fileName);
+}
+
+function _matchSharpLibvipsFileName(fileName: string) {
+  if (process.platform === 'darwin') {
+    return fileName.endsWith('.dylib');
+  }
+  if (process.platform === 'win32') {
+    return /\.dll$/i.test(fileName);
+  }
+  return /\.so(?:\..+)?$/.test(fileName);
+}

package/vona/packages-vona/vona-core/src/lib/addon/sqlite3.ts

@@ -0,0 +1,23 @@
+import fse from 'fs-extra';
+import { createRequire } from 'node:module';
+import path from 'node:path';
+
+import type { VonaApplication } from '../core/application.ts';
+
+import { getHomeVonaAppDir } from '../core/config.ts';
+import { pathToHref } from '../utils/util.ts';
+
+export function getSqlite3DatabaseNameDefault(app: VonaApplication) {
+  const mode = app.meta.env.META_MODE;
+  if (mode !== 'prod') return '';
+  const dbPath = path.join(getHomeVonaAppDir(app), 'sqlite3');
+  fse.ensureDirSync(dbPath);
+  return path.join(dbPath, `${app.name}.db`);
+}
+
+export function resolverSqlite3(projectPath: string) {
+  // src
+  const require = createRequire(pathToHref(path.join(projectPath, '/')));
+  const modulePath = require.resolve('better-sqlite3/package.json');
+  return path.join(path.dirname(modulePath), 'build/Release/better_sqlite3.node');
+}

package/vona/packages-vona/vona-core/src/lib/index.ts

@@ -4,3 +4,4 @@ export * from './decorator/index.ts';
 export * from './framework/index.ts';
 export * from './mappedClass/index.ts';
 export * from './utils/index.ts';
+export * from './addon/index.ts';

package/vona/packages-vona/vona-core/src/lib/utils/index.ts

@@ -2,7 +2,6 @@ import { zodExtendOpenApi } from './zod-openapi.ts';
 
 export * from './protocolKey.ts';
 export * from './retry.ts';
-export * from './sqlite3.ts';
 export * from './util.ts';
 
 zodExtendOpenApi();

package/vona/packages-vona/vona-core/src/lib/utils/util.ts

@@ -30,6 +30,7 @@ import type { IBeanSceneRecord } from '../decorator/interface/beanOptions.ts';
 import type { ZodLocaleErrors } from './zod-enhance.ts';
 
 import { cast } from '../../types/index.ts';
+import { requireAddon } from '../addon/addon.ts';
 import { BeanSimple } from '../bean/beanSimple.ts';
 import { zodSetLocaleErrors } from './zod-enhance.ts';
 
@@ -306,6 +307,10 @@ export class AppUtil extends BeanSimple {
   setLocaleErrors(localeErrors: ZodLocaleErrors, localeDefault?: string) {
     return zodSetLocaleErrors(this.app, localeErrors, localeDefault);
   }
+
+  requireAddon(addonName: string) {
+    return requireAddon(addonName);
+  }
 }
 
 export function compose(chains, adapter?) {

package/vona/packages-vona/vona-mock/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-mock",
-  "version": "6.1.30",
+  "version": "6.1.31",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona mock",
   "keywords": [
@@ -34,7 +34,7 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "@cabloy/module-info": "^2.0.0",
+    "@cabloy/module-info": "^2.0.3",
     "@cabloy/module-info-pro": "workspace:^",
     "vona-core": "workspace:^"
   },