@researchdatabox/redbox-dev-tools 0.0.1-beta.9018 → 0.0.1-beta.9022

package/dist/templates/hook-archetype.js

@@ -86,15 +86,58 @@ function toOutputRelativePath(templateRoot, filePath) {
 function shouldMarkExecutable(relativePath) {
     return relativePath.endsWith('.sh');
 }
-function readPackageVersion(packageRoot, packageName) {
-    const packageJsonPath = path.join(packageRoot, '..', packageName, 'package.json');
-    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
-    if (!packageJson.version) {
-        throw new Error(`Could not determine version for ${packageName}`);
+function readPackageJson(packageJsonPath) {
+    return JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+}
+function tryReadPackageJson(packageJsonPath) {
+    return fs.existsSync(packageJsonPath)
+        ? readPackageJson(packageJsonPath)
+        : undefined;
+}
+function getScopedPackageName(packageName) {
+    return `@researchdatabox/${packageName}`;
+}
+function readOwnPackageVersion(packageRoot) {
+    const packageJson = tryReadPackageJson(path.join(packageRoot, 'package.json'));
+    if (!packageJson?.version) {
+        throw new Error('Could not determine version for @researchdatabox/redbox-dev-tools');
     }
     return packageJson.version;
 }
+function tryReadInstalledPackageVersion(packageRoot, packageName) {
+    const packageJsonPath = path.join(packageRoot, 'node_modules', ...getScopedPackageName(packageName).split('/'), 'package.json');
+    return tryReadPackageJson(packageJsonPath)?.version;
+}
+function isReusableDependencySpecifier(versionSpecifier) {
+    return !/^(file:|workspace:|link:|portal:)/.test(versionSpecifier);
+}
+function readDeclaredDependencyVersion(packageRoot, packageName) {
+    const packageJson = tryReadPackageJson(path.join(packageRoot, 'package.json'));
+    const dependencyName = getScopedPackageName(packageName);
+    const versionSpecifier = packageJson?.dependencies?.[dependencyName]
+        ?? packageJson?.peerDependencies?.[dependencyName]
+        ?? packageJson?.devDependencies?.[dependencyName];
+    return versionSpecifier && isReusableDependencySpecifier(versionSpecifier)
+        ? versionSpecifier
+        : undefined;
+}
+function readDependencyPackageVersion(packageRoot, packageName) {
+    const installedVersion = tryReadInstalledPackageVersion(packageRoot, packageName);
+    if (installedVersion) {
+        return installedVersion;
+    }
+    const siblingPackageJson = tryReadPackageJson(path.join(packageRoot, '..', packageName, 'package.json'));
+    if (siblingPackageJson?.version) {
+        return siblingPackageJson.version;
+    }
+    const declaredVersion = readDeclaredDependencyVersion(packageRoot, packageName);
+    if (declaredVersion) {
+        return declaredVersion;
+    }
+    throw new Error(`Could not determine version for ${getScopedPackageName(packageName)}`);
+}
 function buildTemplateContext(options) {
+    const packageRoot = getPackageRoot();
     const packageName = normalizePackageName(options.packageName);
     const hookShortName = packageName.replace(/^redbox-hook-/, '');
     const hookPascalName = toPascalCase(hookShortName);
@@ -104,8 +147,8 @@ function buildTemplateContext(options) {
         hookPascalName,
         description: options.description ?? `ReDBox hook for ${hookPascalName}`,
         integrationDirName: hookShortName,
-        redboxCoreVersion: readPackageVersion(getPackageRoot(), 'redbox-core'),
-        redboxDevToolsVersion: readPackageVersion(getPackageRoot(), 'redbox-dev-tools'),
+        redboxCoreVersion: readDependencyPackageVersion(packageRoot, 'redbox-core'),
+        redboxDevToolsVersion: readOwnPackageVersion(packageRoot),
     };
 }
 function generateHookArchetype(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@researchdatabox/redbox-dev-tools",
-  "version": "0.0.1-beta.9018",
+  "version": "0.0.1-beta.9022",
   "description": "ReDBox customisation dev tools - shared configuration, generators, and migration tooling",
   "type": "commonjs",
   "main": "index.js",
@@ -44,8 +44,8 @@
   },
   "homepage": "https://github.com/redbox-mint/redbox-portal/tree/v4.5.1#readme",
   "dependencies": {
-    "@researchdatabox/redbox-core": "0.0.1-beta.9018",
-    "@researchdatabox/sails-ng-common": "0.0.1-beta.9018",
+    "@researchdatabox/redbox-core": "0.0.1-beta.9022",
+    "@researchdatabox/sails-ng-common": "0.0.1-beta.9022",
     "@tsconfig/node24": "24.0.1",
     "@types/chai": "5.2.3",
     "@types/lodash": "4.17.24",
@@ -64,8 +64,8 @@
     "zod": "3.25.28"
   },
   "devDependencies": {
-    "@types/sinon": "17.0.3",
-    "sinon": "17.0.1"
+    "@types/sinon": "21.0.1",
+    "sinon": "21.1.2"
   },
   "peerDependenciesMeta": {
     "@researchdatabox/redbox-core": {