diff --git a/CHANGELOG.md b/CHANGELOG.md index acbaf24..8dc52af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # CHANGELOG +## v1.1.3-rc.1 (2025-01-14) + +### Bug Fixes + +- **schemas_script**: From ogw-viewer + ([`8c712ae`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/8c712ae89d6bdeb244ee71b76e6ca55d5fd34f19)) + + ## v1.1.2 (2025-01-03) diff --git a/generate_schemas.js b/generate_schemas.js deleted file mode 100644 index 8cf4f74..0000000 --- a/generate_schemas.js +++ /dev/null @@ -1,80 +0,0 @@ -const fs = require("fs"); -const path = require("path"); -const glob = require("glob"); -const process = require("process"); - -const findDirectoryPath = (targetDirectoryName) => { - const pathToCheck = path.join(process.cwd(), targetDirectoryName); - const folders = fs - .readdirSync(pathToCheck, { withFileTypes: true }) - .filter( - (folder) => folder.isDirectory() && !folder.name.endsWith(".egg-info") - ) - .map((folder) => ({ - name: folder.name, - path: path.join(pathToCheck, folder.name), - })); - const rpcDirectory = path.join(folders[0].path, "rpc"); - return [rpcDirectory, folders[0].name]; -}; - -const [directoryPath, project_name] = findDirectoryPath("src/"); - -const outputFile = path.join(process.cwd(), "schemas.json"); - -function return_json_schema(directoryPath, folder_path, project_name) { - const folders = fs - .readdirSync(path.normalize(directoryPath), { withFileTypes: true }) - .filter((folder) => folder.isDirectory()) - .map((folder) => ({ - name: folder.name, - path: path.join(directoryPath, folder.name), - })); - var folders_schemas = {}; - folders.forEach((folder) => { - if (folder.name == "schemas") { - const jsonFiles = glob.sync(path.join(folder.path, "**/*.json")); - var schemas = {}; - jsonFiles.forEach((filePath) => { - try { - const fileContent = fs.readFileSync(filePath, "utf8"); - var jsonData = JSON.parse(fileContent); - var filename = filePath - .replace(/^.*[\\/]/, "") - .replace(/\.[^/.]+$/, ""); - var rpc = jsonData["rpc"]; - jsonData["$id"] = project_name + folder_path + "." + rpc; - schemas[filename] = jsonData; - } catch (error) { - console.error( - `Erreur lors de la lecture du fichier ${filePath}:`, - error - ); - } - }); - folders_schemas = Object.keys(schemas).reduce((acc, key) => { - const currentSchema = schemas[key]; - const modifiedSchema = { - $id: path.join(folder_path, currentSchema["$id"]), - ...currentSchema, - }; - acc[key] = modifiedSchema; - return acc; - }, folders_schemas); - } else { - var new_folder_path = folder_path + "." + folder.name; - var test = return_json_schema(folder.path, new_folder_path, project_name); - folders_schemas[folder.name] = test; - } - }); - return folders_schemas; -} - -if (fs.existsSync(outputFile)) { - fs.unlinkSync(outputFile); -} - -const finalJson = {}; -finalJson[project_name] = return_json_schema(directoryPath, "", project_name); - -fs.writeFileSync(outputFile, JSON.stringify(finalJson, null, 2)); diff --git a/package-lock.json b/package-lock.json index 14ffec8..0456250 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,28 +9,23 @@ "version": "0.0.0-semantically-released", "license": "MIT", "dependencies": { - "glob": "^10.3.10" + "@geode/opengeodeweb-back": "5.4.1" } }, - "node_modules/foreground-child": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "node_modules/@geode/opengeodeweb-back": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/@geode/opengeodeweb-back/-/opengeodeweb-back-5.4.1.tgz", + "integrity": "sha512-6g3GUE7JjdZdoxplgo7uJ82YyyyOYHJrwOBz5TQW53ftv9suUCwEW+eYk//3MvC7B5T5r3r+v5v5afwS4RXAkA==", + "license": "MIT", "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "glob": "^10.3.10" } }, - "node_modules/foreground-child/node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -40,36 +35,19 @@ "node": ">= 8" } }, - "node_modules/foreground-child/node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" - }, - "node_modules/foreground-child/node_modules/path-key": { + "node_modules/foreground-child": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "engines": { - "node": ">=8" - } - }, - "node_modules/foreground-child/node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", "dependencies": { - "shebang-regex": "^3.0.0" + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" }, "engines": { - "node": ">=8" - } - }, - "node_modules/foreground-child/node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "engines": { - "node": ">=8" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/foreground-child/node_modules/signal-exit": { @@ -83,20 +61,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/foreground-child/node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/glob": { "version": "10.3.10", "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", @@ -118,6 +82,12 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "license": "ISC" + }, "node_modules/jackspeak": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", @@ -423,6 +393,15 @@ "node": ">=16 || 14 >=14.17" } }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/path-scurry": { "version": "1.10.1", "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", @@ -445,6 +424,42 @@ "engines": { "node": "14 || >=16.14" } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } } } } diff --git a/package.json b/package.json index 803a6b0..94811aa 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "@geode/opengeodeweb-viewer", "scripts": { - "json": "node generate_schemas.js", + "json": "npm explore @geode/opengeodeweb-back -- npm run json opengeodeweb_viewer rpc rpc .", "test": "npm run json && pytest" }, "dependencies": { - "glob": "^10.3.10" + "@geode/opengeodeweb-back": "5.4.1" }, "exports": { "./schemas.json": { diff --git a/pyproject.toml b/pyproject.toml index a13038c..18f8a94 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "OpenGeodeWeb-Viewer" -version = "1.1.2" +version = "1.1.3-rc.1" dynamic = ["dependencies"] authors = [ { name="Geode-solutions", email="team-web@geode-solutions.com" },