patch: test 34

.idea/misc.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_22" default="true" project-jdk-name="openjdk-22" project-jdk-type="JavaSDK">
+  <component name="Black">
+    <option name="sdkName" value="Python 3.11" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_22" default="true" project-jdk-name="Python 3.11" project-jdk-type="Python SDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

jsconfig.json

@@ -5,13 +5,12 @@
     "moduleResolution": "node",
     "baseUrl": ".",
     "paths": {
-      "@/*": ["front/*"]
     },
     "allowSyntheticDefaultImports": true,
     "jsx": "preserve"
   },
   "include": [
-    "frontend/**/*"
+    "scripts/*"
   ],
   "exclude": ["node_modules", "dist"]
 }

package-lock.json

@@ -1,12 +1,12 @@
 {
-	"name": "@cicd",
+	"name": "cicd",
-	"version": "2.7.15",
+	"version": "0.0.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
-			"name": "@cicd",
+			"name": "cicd",
-			"version": "2.7.15",
+			"version": "0.0.2",
 			"license": "Exygen",
 			"engines": {
 				"node": "<=25.9.0",

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "cicd",
 	"private": true,
-	"version": "0.0.1",
+	"version": "0.0.2",
 	"description": "Node.js Rest Apis with Express, Sequelize & PostgreSQL",
 	"scripts": {
 		"update:patch": "node scripts/update-version.js -patch",
@@ -15,5 +15,11 @@
 	},
 	"keywords": [],
 	"author": "Stephane Passignat",
-	"license": "Exygen"
+	"license": "Exygen",
+	"main": "versions.js",
+	"repository": {
+		"type": "git",
+		"url": "http://gitea.cicd.exygen.fr/stephane/test-cicd.git"
+	},
+	"type": "commonjs"
 }

scripts/copy-resources.js

@@ -1,151 +0,0 @@
-console.log(process.cwd());
-const fs = require('fs');
-const builder = require('./generators/generate-jsdoc');
-const plant = require('./generators/generate-plantuml');
-const data = require('./generators/generate-namedlist');
-const tax = require('./generators/generate-tax');
-const classesFront = require('./generators/generate-class');
-const classesBack = require('./generators/generate-class-back');
-const path = require('path');
-let path1 = path.join("dist", "back");
-if (!fs.existsSync(path1)) {
-	fs.mkdirSync(path1, {recursive: true});
-}
-
-// Fonction pour copier un fichier
-function copyFile(source, destination) {
-	fs.mkdirSync(path.dirname(destination), {recursive: true});
-	fs.copyFileSync(source, destination);
-}
-
-function copyResources() {
-// Chemins source et destination
-	const resources = [{
-		source: path.join(__dirname, "config", `front-${env}.json`),
-		target: path.join(__dirname, "front", `config.json`)
-	}, {
-		source: path.join(__dirname, "config", `back-${env}.json`),
-		target: path.join(__dirname, "back", `config.json`)
-	}, {
-		source: path.join(__dirname, "config", `front-${env}.json`),
-		target: path.join(__dirname, "dist/front", `config.json`)
-	}, {
-		source: path.join(__dirname, "config", `back-${env}.json`),
-		target: path.join(__dirname, "dist/back", `config.json`)
-	}, {
-		source: path.join(__dirname, "package.json"),
-		target: path.join(__dirname, "dist", "package.json")
-	}, {
-		source: path.join(__dirname, "package-lock.json"),
-		target: path.join(__dirname, "dist", "package-lock.json")
-	}, {
-		source: path.join(__dirname, "vite.config.js"),
-		target: path.join(__dirname, "dist", "vite.config.js")
-	}];
-	for (const resource of resources) {
-		copyFile(resource.source, resource.target);
-	}
-	for (const resource of resources) {
-		if (resource.target.endsWith("config.json")) {
-			setConfigVersion(resource.target);
-		}
-	}
-	fs.mkdirSync(path.dirname("dist/model"), {recursive: true});
-	fs.mkdirSync(path.dirname("dist/back"), {recursive: true});
-	fs.mkdirSync(path.dirname("dist/app"), {recursive: true});
-	fs.mkdirSync(path.dirname("dist/data"), {recursive: true});
-	fs.cpSync("back", "dist/back", {recursive: true});
-	fs.cpSync("model", "dist/model", {recursive: true});
-	fs.cpSync("app", "dist/app", {recursive: true});
-	fs.cpSync("data", "dist/data", {recursive: true});
-}
-
-
-function updateVersion(major = false, minor = false, patch = true) {
-	let obj;
-	try {
-		obj = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
-		let currentVersion = obj.version;
-
-		let versions = currentVersion.split('.');
-		let majorVersion = versions[0];
-		let minorVersion = versions[1];
-		let patchVersion = versions[2];
-		if (major) {
-			let number = Number.parseInt(majorVersion);
-			number++;
-			versions[0] = number;
-			versions[1] = 0;
-			versions[2] = 0;
-		} else if (minor) {
-			let number = Number.parseInt(minorVersion);
-			number++;
-			versions[0] = majorVersion;
-			versions[1] = number;
-			versions[2] = 0;
-		} else if (patch) {
-			let number = Number.parseInt(patchVersion);
-			number++;
-			versions[0] = majorVersion;
-			versions[1] = minorVersion;
-			versions[2] = number;
-		}
-		let newVersion = versions.join('.');
-		obj.version = newVersion;
-
-		fs.writeFileSync("./package.json", JSON.stringify(obj, null, "\t"), 'utf8');
-		let newVar = {
-			oldVersion: currentVersion,
-			newVersion: newVersion
-		};
-		return newVar;
-	} catch (e) {
-	}
-}
-
-function setConfigVersion(resource) {
-	let src;
-	try {
-		src = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
-		let versions = src.version;
-		target = JSON.parse(fs.readFileSync(resource, 'utf8'));
-		target.version = versions;
-		fs.writeFileSync(resource, JSON.stringify(target), 'utf8')
-	} catch (e) {
-	}
-}
-
-let env = "local";
-let major = false;
-let minor = false;
-let patch = false;
-process.argv.forEach(function (val, index, array) {
-	if (val === "-local") {
-		env = "local"
-	} else if (val === "-prod") {
-		env = "prod";
-	} else if (val === "-patch") {
-		patch = true;
-	} else if (val === "-major") {
-		major = true;
-	} else if (val === "-minor") {
-		minor = true;
-	}
-});
-
-if (patch||minor||major) {
-	let updateVersion1 = updateVersion(major,minor,patch);
-	let src = path.join(__dirname, "back", "models", "current.sql");
-	let tgt = path.join(__dirname, "back", "models", "sql", `version-${updateVersion1.oldVersion}-${updateVersion1.newVersion}.sql`);
-	fs.copyFileSync(src, tgt);
-	let writeStream = fs.createWriteStream(src);
-	writeStream.close();
-}
-
-copyResources();
-builder.generateJSDocTypes('./model/DataModel.json', './types.js');
-plant.generatePlantUML('./model/DataModel.json', './model.puml');
-// data.generateTVA("./tva_agriculture_detaillee.csv","./data/NamedList.json");
-// tax.generateTax("./tva_agriculture_detaillee.csv","./data/Tax.json");
-classesFront.generateClasses('./model/DataModel.json',"./front/data/");
-classesBack.generateClasses('./model/DataModel.json',"./back/data/");

scripts/update-version.js

@@ -73,8 +73,13 @@ process.argv.forEach(function (val, index, array) {
 
 if (patch||minor||major) {
 	let updateVersion1 = updateVersion(major,minor,patch);
+	let sql = path.join(__dirname,"..", "database", "src","sql");
 	let src = path.join(__dirname,"..", "database", "current.sql");
 	let tgt = path.join(__dirname,"..", "database", "src", "sql", `version-${updateVersion1.oldVersion}-${updateVersion1.newVersion}.sql`);
+	fs.mkdirSync(sql);
+	if(!fs.existsSync(src)){
+		fs.appendFileSync(sql, "", 'utf8');
+	}
 	fs.copyFileSync(src, tgt);
 	let writeStream = fs.createWriteStream(src);
 	writeStream.close();