@addev-be/framework-utils 0.16.0 → 0.16.1

package/bin/commit-release.mjs

@@ -1,5 +1,5 @@
-#!/usr/bin/env node
-
-import { commitRelease } from '../node/commit-release.mjs';
-
-commitRelease();
+#!/usr/bin/env node
+
+import { commitRelease } from '../node/commit-release.mjs';
+
+commitRelease();

package/bin/nuget-publish.mjs

@@ -1,5 +1,5 @@
-#!/usr/bin/env node
-
-import { publishNugetPackageToRemoteServer } from '../node/nuget-publish.mjs';
-
-await publishNugetPackageToRemoteServer();
+#!/usr/bin/env node
+
+import { publishNugetPackageToRemoteServer } from '../node/nuget-publish.mjs';
+
+await publishNugetPackageToRemoteServer();

package/bin/update-version.mjs

@@ -1,7 +1,7 @@
-#!/usr/bin/env node
-
-import { getUpdateTypeFromArgv } from '../node/helpers/versions.mjs';
-import { updatePackagesVersion } from '../node/update-version.mjs';
-
-const updateType = getUpdateTypeFromArgv();
-updatePackagesVersion(updateType);
+#!/usr/bin/env node
+
+import { getUpdateTypeFromArgv } from '../node/helpers/versions.mjs';
+import { updatePackagesVersion } from '../node/update-version.mjs';
+
+const updateType = getUpdateTypeFromArgv();
+updatePackagesVersion(updateType);

package/node/commit-release.mjs

@@ -1,20 +1,20 @@
-import { execSync } from 'child_process';
-import { getCurrentVersion } from './helpers/versions.mjs';
-
-export const commitRelease = () => {
-  const newVersion = getCurrentVersion();
-
-  execSync('git add .', { stdio: 'inherit' });
-  execSync(`git commit -m "chore: release ${newVersion}"`, {
-    stdio: 'inherit',
-  });
-  execSync(`git tag -a ${newVersion} -m "${newVersion}"`, {
-    stdio: 'inherit',
-  });
-  execSync(`git push origin`, {
-    stdio: 'inherit',
-  });
-  execSync(`git push origin --tags`, {
-    stdio: 'inherit',
-  });
-};
+import { execSync } from 'child_process';
+import { getCurrentVersion } from './helpers/versions.mjs';
+
+export const commitRelease = () => {
+  const newVersion = getCurrentVersion();
+
+  execSync('git add .', { stdio: 'inherit' });
+  execSync(`git commit -m "chore: release ${newVersion}"`, {
+    stdio: 'inherit',
+  });
+  execSync(`git tag -a ${newVersion} -m "${newVersion}"`, {
+    stdio: 'inherit',
+  });
+  execSync(`git push origin`, {
+    stdio: 'inherit',
+  });
+  execSync(`git push origin --tags`, {
+    stdio: 'inherit',
+  });
+};

package/node/helpers/versions.mjs

@@ -1,140 +1,140 @@
-import * as glob from 'glob';
-
-import { readFileSync, writeFileSync } from 'fs';
-
-import { cwd } from 'process';
-import { join } from 'path';
-
-const __dirname = cwd();
-
-export const replaceVersionInCSharpProject = (path, newVersion) => {
-  console.log('Replacing version in C# project file', path);
-  const fileContents = readFileSync(path, 'utf-8');
-  const newFileContents = fileContents
-    .replace(/<Version>.*<\/Version>/g, `<Version>${newVersion}</Version>`)
-    .replace(
-      /<AssemblyVersion>.*<\/AssemblyVersion>/g,
-      `<AssemblyVersion>${newVersion}</AssemblyVersion>`
-    )
-    .replace(
-      /<FileVersion>.*<\/FileVersion>/g,
-      `<FileVersion>${newVersion}</FileVersion>`
-    );
-  writeFileSync(path, newFileContents);
-};
-
-export const replaceVersionInCSharpProjects = (globPath, newVersion) => {
-  const files = glob.sync(globPath.replace(/\\/g, '/'));
-  files.forEach((file) => replaceVersionInCSharpProject(file, newVersion));
-};
-
-export const replaceVersionInAssemblyInfoFile = (path, newVersion) => {
-  console.log('Replacing version in C# AssemblyInfo file', path);
-  const fileContents = readFileSync(path, 'utf-8');
-  const newFileContents = fileContents.replace(
-    /Version\("\d+\.\d+\.\d+"\)\]/g,
-    `Version("${newVersion}")]`
-  );
-  writeFileSync(path, newFileContents);
-};
-
-export const replaceVersionInAssemblyInfoFiles = (globPath, newVersion) => {
-  const files = glob.sync(globPath.replace(/\\/g, '/'));
-  files.forEach((file) => replaceVersionInAssemblyInfoFile(file, newVersion));
-};
-
-export const replaceVersionInMsiFile = (path, newVersion) => {
-  console.log('Replacing version in MSI file', path);
-  const fileContents = readFileSync(path, 'utf-8');
-  const newFileContents = fileContents
-    .replace(
-      /<ROW Property="ProductVersion" Value="\d+\.\d+\.\d+"/g,
-      `<ROW Property="ProductVersion" Value="${newVersion}"`
-    )
-    .replace(
-      /<ROW Property="ProductCode" Value="1033:\{[0-9A-F-]{36}\}/g,
-      `<ROW Property="ProductCode" Value="1033:{${v4().toUpperCase()}}`
-    );
-  writeFileSync(path, newFileContents);
-};
-
-export const replaceVersionInMsiFiles = (globPath, newVersion) => {
-  const files = glob.sync(globPath.replace(/\\/g, '/'));
-  files.forEach((file) => replaceVersionInMsiFile(file, newVersion));
-};
-
-export const replaceVersionInPackageJsonFile = (path, newVersion) => {
-  console.log('Replacing version in package.json', path);
-  const fileContents = readFileSync(path, 'utf-8');
-  const newFileContents = fileContents.replace(
-    /"version": "\d+\.\d+\.\d+"/g,
-    `"version": "${newVersion}"`
-  );
-  writeFileSync(path, newFileContents);
-};
-
-export const replaceVersionInPackageJsonFiles = (globPath, newVersion) => {
-  const files = glob.sync(globPath.replace(/\\/g, '/'), {
-    ignore: ['./node_modules/**', '**/node_modules/**'],
-  });
-  files.forEach((file) => replaceVersionInPackageJsonFile(file, newVersion));
-};
-
-export const replaceVersionInEnvFile = (path, newVersion) => {
-  console.log('Replacing version in env file', path);
-  const fileContents = readFileSync(path, 'utf-8');
-  const newFileContents = fileContents.replace(
-    /APP_VERSION=\d+\.\d+\.\d+/g,
-    `APP_VERSION=${newVersion}`
-  );
-  writeFileSync(path, newFileContents);
-};
-
-export const replaceVersionInEnvFiles = (globPath, newVersion) => {
-  const files = glob.sync(globPath.replace(/\\/g, '/'));
-  files.forEach((file) => replaceVersionInEnvFile(file, newVersion));
-};
-
-export const replaceVersionInGitLabCi = (path, newVersion) => {
-  console.log('Replacing version in GitLab CI file', path);
-  const fileContents = readFileSync(path, 'utf-8');
-  const newFileContents = fileContents.replace(
-    /APP_VERSION: \d+\.\d+\.\d+/g,
-    `APP_VERSION: ${newVersion}`
-  );
-  writeFileSync(path, newFileContents);
-};
-
-export const replaceVersionInDockerCompose = (path, newVersion) => {
-  console.log('Replacing version in Docker Compose file', path);
-  const fileContents = readFileSync(path, 'utf-8');
-  const newFileContents = fileContents.replace(
-    /image: ([^\:]+):\d+\.\d+\.\d+/g,
-    `image: $1:${newVersion}`
-  );
-  writeFileSync(path, newFileContents);
-};
-
-export const getCurrentVersion = () => {
-  const packageJson = JSON.parse(
-    readFileSync(join(__dirname, 'package.json'), 'utf-8')
-  );
-  return packageJson.version;
-};
-
-export const getUpdateTypeFromArgv = () => {
-  const [, , updateType] = process.argv;
-  if (!updateType) {
-    console.error('No version update type provided');
-    process.exit(1);
-  }
-
-  if (!['major', 'minor', 'patch'].includes(updateType)) {
-    console.error(
-      'Invalid version update type : expected "major", "minor" or "patch"'
-    );
-    process.exit(1);
-  }
-
-  return updateType;
-};
+import * as glob from 'glob';
+
+import { readFileSync, writeFileSync } from 'fs';
+
+import { cwd } from 'process';
+import { join } from 'path';
+
+const __dirname = cwd();
+
+export const replaceVersionInCSharpProject = (path, newVersion) => {
+  console.log('Replacing version in C# project file', path);
+  const fileContents = readFileSync(path, 'utf-8');
+  const newFileContents = fileContents
+    .replace(/<Version>.*<\/Version>/g, `<Version>${newVersion}</Version>`)
+    .replace(
+      /<AssemblyVersion>.*<\/AssemblyVersion>/g,
+      `<AssemblyVersion>${newVersion}</AssemblyVersion>`
+    )
+    .replace(
+      /<FileVersion>.*<\/FileVersion>/g,
+      `<FileVersion>${newVersion}</FileVersion>`
+    );
+  writeFileSync(path, newFileContents);
+};
+
+export const replaceVersionInCSharpProjects = (globPath, newVersion) => {
+  const files = glob.sync(globPath.replace(/\\/g, '/'));
+  files.forEach((file) => replaceVersionInCSharpProject(file, newVersion));
+};
+
+export const replaceVersionInAssemblyInfoFile = (path, newVersion) => {
+  console.log('Replacing version in C# AssemblyInfo file', path);
+  const fileContents = readFileSync(path, 'utf-8');
+  const newFileContents = fileContents.replace(
+    /Version\("\d+\.\d+\.\d+"\)\]/g,
+    `Version("${newVersion}")]`
+  );
+  writeFileSync(path, newFileContents);
+};
+
+export const replaceVersionInAssemblyInfoFiles = (globPath, newVersion) => {
+  const files = glob.sync(globPath.replace(/\\/g, '/'));
+  files.forEach((file) => replaceVersionInAssemblyInfoFile(file, newVersion));
+};
+
+export const replaceVersionInMsiFile = (path, newVersion) => {
+  console.log('Replacing version in MSI file', path);
+  const fileContents = readFileSync(path, 'utf-8');
+  const newFileContents = fileContents
+    .replace(
+      /<ROW Property="ProductVersion" Value="\d+\.\d+\.\d+"/g,
+      `<ROW Property="ProductVersion" Value="${newVersion}"`
+    )
+    .replace(
+      /<ROW Property="ProductCode" Value="1033:\{[0-9A-F-]{36}\}/g,
+      `<ROW Property="ProductCode" Value="1033:{${v4().toUpperCase()}}`
+    );
+  writeFileSync(path, newFileContents);
+};
+
+export const replaceVersionInMsiFiles = (globPath, newVersion) => {
+  const files = glob.sync(globPath.replace(/\\/g, '/'));
+  files.forEach((file) => replaceVersionInMsiFile(file, newVersion));
+};
+
+export const replaceVersionInPackageJsonFile = (path, newVersion) => {
+  console.log('Replacing version in package.json', path);
+  const fileContents = readFileSync(path, 'utf-8');
+  const newFileContents = fileContents.replace(
+    /"version": "\d+\.\d+\.\d+"/g,
+    `"version": "${newVersion}"`
+  );
+  writeFileSync(path, newFileContents);
+};
+
+export const replaceVersionInPackageJsonFiles = (globPath, newVersion) => {
+  const files = glob.sync(globPath.replace(/\\/g, '/'), {
+    ignore: ['./node_modules/**', '**/node_modules/**'],
+  });
+  files.forEach((file) => replaceVersionInPackageJsonFile(file, newVersion));
+};
+
+export const replaceVersionInEnvFile = (path, newVersion) => {
+  console.log('Replacing version in env file', path);
+  const fileContents = readFileSync(path, 'utf-8');
+  const newFileContents = fileContents.replace(
+    /APP_VERSION=\d+\.\d+\.\d+/g,
+    `APP_VERSION=${newVersion}`
+  );
+  writeFileSync(path, newFileContents);
+};
+
+export const replaceVersionInEnvFiles = (globPath, newVersion) => {
+  const files = glob.sync(globPath.replace(/\\/g, '/'));
+  files.forEach((file) => replaceVersionInEnvFile(file, newVersion));
+};
+
+export const replaceVersionInGitLabCi = (path, newVersion) => {
+  console.log('Replacing version in GitLab CI file', path);
+  const fileContents = readFileSync(path, 'utf-8');
+  const newFileContents = fileContents.replace(
+    /APP_VERSION: \d+\.\d+\.\d+/g,
+    `APP_VERSION: ${newVersion}`
+  );
+  writeFileSync(path, newFileContents);
+};
+
+export const replaceVersionInDockerCompose = (path, newVersion) => {
+  console.log('Replacing version in Docker Compose file', path);
+  const fileContents = readFileSync(path, 'utf-8');
+  const newFileContents = fileContents.replace(
+    /image: ([^\:]+):\d+\.\d+\.\d+/g,
+    `image: $1:${newVersion}`
+  );
+  writeFileSync(path, newFileContents);
+};
+
+export const getCurrentVersion = () => {
+  const packageJson = JSON.parse(
+    readFileSync(join(__dirname, 'package.json'), 'utf-8')
+  );
+  return packageJson.version;
+};
+
+export const getUpdateTypeFromArgv = () => {
+  const [, , updateType] = process.argv;
+  if (!updateType) {
+    console.error('No version update type provided');
+    process.exit(1);
+  }
+
+  if (!['major', 'minor', 'patch'].includes(updateType)) {
+    console.error(
+      'Invalid version update type : expected "major", "minor" or "patch"'
+    );
+    process.exit(1);
+  }
+
+  return updateType;
+};

package/node/nuget-publish.mjs

@@ -1,33 +1,33 @@
-#!/usr/bin/env node
-
-import { exec } from 'child_process';
-import { existsSync } from 'fs';
-import { getCurrentVersion } from './helpers/versions.mjs';
-
-export const publishNugetPackageToRemoteServer = async () => {
-  const nugetFeedUrl = 'https://nuget.ad-dev.be/v3/index.json';
-  const nugetApiKey = '4d1745649b06';
-  const currentVersion = getCurrentVersion();
-  const nugetPackagePath = `./packages/backend/bin/Release/ADDEV.Framework.Backend.${currentVersion}.nupkg`;
-
-  // Check if the nuget feed directory exists
-  if (!existsSync(nugetPackagePath)) {
-    console.log('NuGet package', nugetPackagePath, 'not found');
-    process.exit(1);
-  }
-
-  console.log(`Publishing ${nugetPackagePath} file to nuget server...`);
-  exec(
-    `dotnet nuget push -s "${nugetFeedUrl}" -k ${nugetApiKey} ${nugetPackagePath} --skip-duplicate`,
-    (err, stdout, stderr) => {
-      if (err) {
-        console.error(`Error publishing ${nugetPackagePath}:`, err);
-        return;
-      }
-      console.log(stdout);
-      console.error(stderr);
-    }
-  );
-
-  console.log('Publishing complete.');
-};
+#!/usr/bin/env node
+
+import { exec } from 'child_process';
+import { existsSync } from 'fs';
+import { getCurrentVersion } from './helpers/versions.mjs';
+
+export const publishNugetPackageToRemoteServer = async () => {
+  const nugetFeedUrl = 'https://nuget.ad-dev.be/v3/index.json';
+  const nugetApiKey = '4d1745649b06';
+  const currentVersion = getCurrentVersion();
+  const nugetPackagePath = `./packages/backend/bin/Release/ADDEV.Framework.Backend.${currentVersion}.nupkg`;
+
+  // Check if the nuget feed directory exists
+  if (!existsSync(nugetPackagePath)) {
+    console.log('NuGet package', nugetPackagePath, 'not found');
+    process.exit(1);
+  }
+
+  console.log(`Publishing ${nugetPackagePath} file to nuget server...`);
+  exec(
+    `dotnet nuget push -s "${nugetFeedUrl}" -k ${nugetApiKey} ${nugetPackagePath} --skip-duplicate`,
+    (err, stdout, stderr) => {
+      if (err) {
+        console.error(`Error publishing ${nugetPackagePath}:`, err);
+        return;
+      }
+      console.log(stdout);
+      console.error(stderr);
+    }
+  );
+
+  console.log('Publishing complete.');
+};

package/node/update-version.mjs

@@ -1,55 +1,55 @@
-import {
-  getCurrentVersion,
-  replaceVersionInCSharpProjects,
-  replaceVersionInPackageJsonFile,
-  replaceVersionInPackageJsonFiles,
-} from './helpers/versions.mjs';
-
-import { cwd } from 'process';
-import { inc } from 'semver';
-import { join } from 'path';
-
-export const defaultUpdateFunc = (newVersion) => {
-  replaceVersionInPackageJsonFile(join(cwd(), 'package.json'), newVersion);
-  replaceVersionInPackageJsonFiles(
-    join(cwd(), 'packages/**/package.json'),
-    newVersion
-  );
-  replaceVersionInCSharpProjects(
-    join(cwd(), 'packages/**/*.csproj'),
-    newVersion
-  );
-};
-
-export const updatePackagesVersion = (
-  updateType,
-  updateFunc = defaultUpdateFunc
-) => {
-  console.log('~~~ Update packages version ~~~');
-
-  const currentVersion = getCurrentVersion();
-  if (!currentVersion) {
-    throw new Error('Could not get current version from package.json');
-  }
-  console.log(`Current version: ${currentVersion}`);
-
-  switch (updateType) {
-    case 'major':
-    case 'minor':
-    case 'patch': {
-      const incrementedVersion = inc(currentVersion, updateType);
-      updateFunc(incrementedVersion);
-      break;
-    }
-    default:
-      console.log('Invalid version update type');
-      throw new Error(
-        'Invalid version update type, should be "major", "minor" or "patch"'
-      );
-  }
-
-  const newVersion = getCurrentVersion();
-  console.log(`Updated version to: ${newVersion}`);
-
-  return newVersion;
-};
+import {
+  getCurrentVersion,
+  replaceVersionInCSharpProjects,
+  replaceVersionInPackageJsonFile,
+  replaceVersionInPackageJsonFiles,
+} from './helpers/versions.mjs';
+
+import { cwd } from 'process';
+import { inc } from 'semver';
+import { join } from 'path';
+
+export const defaultUpdateFunc = (newVersion) => {
+  replaceVersionInPackageJsonFile(join(cwd(), 'package.json'), newVersion);
+  replaceVersionInPackageJsonFiles(
+    join(cwd(), 'packages/**/package.json'),
+    newVersion
+  );
+  replaceVersionInCSharpProjects(
+    join(cwd(), 'packages/**/*.csproj'),
+    newVersion
+  );
+};
+
+export const updatePackagesVersion = (
+  updateType,
+  updateFunc = defaultUpdateFunc
+) => {
+  console.log('~~~ Update packages version ~~~');
+
+  const currentVersion = getCurrentVersion();
+  if (!currentVersion) {
+    throw new Error('Could not get current version from package.json');
+  }
+  console.log(`Current version: ${currentVersion}`);
+
+  switch (updateType) {
+    case 'major':
+    case 'minor':
+    case 'patch': {
+      const incrementedVersion = inc(currentVersion, updateType);
+      updateFunc(incrementedVersion);
+      break;
+    }
+    default:
+      console.log('Invalid version update type');
+      throw new Error(
+        'Invalid version update type, should be "major", "minor" or "patch"'
+      );
+  }
+
+  const newVersion = getCurrentVersion();
+  console.log(`Updated version to: ${newVersion}`);
+
+  return newVersion;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@addev-be/framework-utils",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "type": "module",
   "export": {
     "node": {