From 5269d6e78a4a455da0619ebfb0eed06322385c62 Mon Sep 17 00:00:00 2001
From: Elora-V <elora95.vigo@gmail.com>
Date: Fri, 27 Sep 2024 15:54:36 +0200
Subject: [PATCH 1/7] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20package-lock.js?=
=?UTF-8?q?on?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package-lock.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 6b1f97e..f0592ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
{
- "name": "@metabohub/metabolic-layout",
+ "name": "@metabohub/viz-layout",
"version": "0.0.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
- "name": "@metabohub/metabolic-layout",
+ "name": "@metabohub/viz-layout",
"version": "0.0.0",
"license": "Apache-2.0",
"dependencies": {
--
GitLab
From 21d97cdaab50f07f12bb0e11cf9f534c64225601 Mon Sep 17 00:00:00 2001
From: Elora-V <elora95.vigo@gmail.com>
Date: Fri, 27 Sep 2024 16:01:15 +0200
Subject: [PATCH 2/7] changement nom package
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 8524865..e93adc9 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "@metabohub/metabolic-layout",
+ "name": "@metabohub/viz-layout",
"version": "0.0.0",
"private": false,
"scripts": {
--
GitLab
From ccef26a57ac983c5bb1d0da3cf0cea3bc5d65fa7 Mon Sep 17 00:00:00 2001
From: Elora-V <elora95.vigo@gmail.com>
Date: Mon, 30 Sep 2024 11:24:27 +0200
Subject: [PATCH 3/7] change packaging : ESM instead of commonjs, to
export/import with import ... from ... (didn't worked for enum and variable)
---
README.md | 2 +-
package-lock.json | 217 ++++++++++++++++++++++++++++++++++++++++++++++
package.json | 2 +
src/index.ts | 29 +++++--
tsconfig.json | 8 +-
5 files changed, 247 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index 78f5d90..f3a790c 100644
--- a/README.md
+++ b/README.md
@@ -112,7 +112,7 @@ declare module "@metabohub/viz-layout";
```typescript
// Imports
import type { Network , Node, Link, GraphStyleProperties, NodeStyle} from "@metabohub/viz-layout/src/types/TypeVizCore";
-import { algorithmOnNetwork } from "@metabohub/viz-layout"
+import { algorithmOnNetwork,PathType, defaultParameters } from "@metabohub/viz-layout"
// Creation of network
const nodes : {[key:string]:Node} = {
diff --git a/package-lock.json b/package-lock.json
index b949f5e..8ecd7c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,6 +16,7 @@
},
"devDependencies": {
"@eslint/js": "^9.10.0",
+ "@swc/core": "^1.7.26",
"@types/eslint__js": "^8.42.3",
"@types/jest": "^29.5.12",
"@types/jsdom": "^21.1.6",
@@ -2221,6 +2222,219 @@
"@sinonjs/commons": "^3.0.0"
}
},
+ "node_modules/@swc/core": {
+ "version": "1.7.26",
+ "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.7.26.tgz",
+ "integrity": "sha512-f5uYFf+TmMQyYIoxkn/evWhNGuUzC730dFwAKGwBVHHVoPyak1/GvJUm6i1SKl+2Hrj9oN0i3WSoWWZ4pgI8lw==",
+ "dev": true,
+ "hasInstallScript": true,
+ "dependencies": {
+ "@swc/counter": "^0.1.3",
+ "@swc/types": "^0.1.12"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/swc"
+ },
+ "optionalDependencies": {
+ "@swc/core-darwin-arm64": "1.7.26",
+ "@swc/core-darwin-x64": "1.7.26",
+ "@swc/core-linux-arm-gnueabihf": "1.7.26",
+ "@swc/core-linux-arm64-gnu": "1.7.26",
+ "@swc/core-linux-arm64-musl": "1.7.26",
+ "@swc/core-linux-x64-gnu": "1.7.26",
+ "@swc/core-linux-x64-musl": "1.7.26",
+ "@swc/core-win32-arm64-msvc": "1.7.26",
+ "@swc/core-win32-ia32-msvc": "1.7.26",
+ "@swc/core-win32-x64-msvc": "1.7.26"
+ },
+ "peerDependencies": {
+ "@swc/helpers": "*"
+ },
+ "peerDependenciesMeta": {
+ "@swc/helpers": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@swc/core-darwin-arm64": {
+ "version": "1.7.26",
+ "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.7.26.tgz",
+ "integrity": "sha512-FF3CRYTg6a7ZVW4yT9mesxoVVZTrcSWtmZhxKCYJX9brH4CS/7PRPjAKNk6kzWgWuRoglP7hkjQcd6EpMcZEAw==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-darwin-x64": {
+ "version": "1.7.26",
+ "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.7.26.tgz",
+ "integrity": "sha512-az3cibZdsay2HNKmc4bjf62QVukuiMRh5sfM5kHR/JMTrLyS6vSw7Ihs3UTkZjUxkLTT8ro54LI6sV6sUQUbLQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-linux-arm-gnueabihf": {
+ "version": "1.7.26",
+ "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.7.26.tgz",
+ "integrity": "sha512-VYPFVJDO5zT5U3RpCdHE5v1gz4mmR8BfHecUZTmD2v1JeFY6fv9KArJUpjrHEEsjK/ucXkQFmJ0jaiWXmpOV9Q==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-linux-arm64-gnu": {
+ "version": "1.7.26",
+ "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.7.26.tgz",
+ "integrity": "sha512-YKevOV7abpjcAzXrhsl+W48Z9mZvgoVs2eP5nY+uoMAdP2b3GxC0Df1Co0I90o2lkzO4jYBpTMcZlmUXLdXn+Q==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-linux-arm64-musl": {
+ "version": "1.7.26",
+ "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.7.26.tgz",
+ "integrity": "sha512-3w8iZICMkQQON0uIcvz7+Q1MPOW6hJ4O5ETjA0LSP/tuKqx30hIniCGOgPDnv3UTMruLUnQbtBwVCZTBKR3Rkg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-linux-x64-gnu": {
+ "version": "1.7.26",
+ "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.7.26.tgz",
+ "integrity": "sha512-c+pp9Zkk2lqb06bNGkR2Looxrs7FtGDMA4/aHjZcCqATgp348hOKH5WPvNLBl+yPrISuWjbKDVn3NgAvfvpH4w==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-linux-x64-musl": {
+ "version": "1.7.26",
+ "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.7.26.tgz",
+ "integrity": "sha512-PgtyfHBF6xG87dUSSdTJHwZ3/8vWZfNIXQV2GlwEpslrOkGqy+WaiiyE7Of7z9AvDILfBBBcJvJ/r8u980wAfQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-win32-arm64-msvc": {
+ "version": "1.7.26",
+ "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.7.26.tgz",
+ "integrity": "sha512-9TNXPIJqFynlAOrRD6tUQjMq7KApSklK3R/tXgIxc7Qx+lWu8hlDQ/kVPLpU7PWvMMwC/3hKBW+p5f+Tms1hmA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-win32-ia32-msvc": {
+ "version": "1.7.26",
+ "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.7.26.tgz",
+ "integrity": "sha512-9YngxNcG3177GYdsTum4V98Re+TlCeJEP4kEwEg9EagT5s3YejYdKwVAkAsJszzkXuyRDdnHUpYbTrPG6FiXrQ==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-win32-x64-msvc": {
+ "version": "1.7.26",
+ "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.7.26.tgz",
+ "integrity": "sha512-VR+hzg9XqucgLjXxA13MtV5O3C0bK0ywtLIBw/+a+O+Oc6mxFWHtdUeXDbIi5AiPbn0fjgVJMqYnyjGyyX8u0w==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/counter": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
+ "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
+ "dev": true
+ },
+ "node_modules/@swc/types": {
+ "version": "0.1.12",
+ "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.12.tgz",
+ "integrity": "sha512-wBJA+SdtkbFhHjTMYH+dEH1y4VpfGdAc2Kw/LK09i9bXd/K6j6PkDcFCEzb6iVfZMkPRrl/q0e3toqTAJdkIVA==",
+ "dev": true,
+ "dependencies": {
+ "@swc/counter": "^0.1.3"
+ }
+ },
"node_modules/@tsconfig/node10": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
@@ -8195,5 +8409,8 @@
"node": "^12.20.0 || >=14"
}
}
+ },
+ "publishConfig": {
+ "registry": "http://votre-registre-prive/npm/"
}
}
diff --git a/package.json b/package.json
index e93adc9..5303de3 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
"name": "@metabohub/viz-layout",
"version": "0.0.0",
"private": false,
+ "type": "module",
"scripts": {
"build": "tsup",
"test": "jest"
@@ -14,6 +15,7 @@
},
"devDependencies": {
"@eslint/js": "^9.10.0",
+ "@swc/core": "^1.7.26",
"@types/eslint__js": "^8.42.3",
"@types/jest": "^29.5.12",
"@types/jsdom": "^21.1.6",
diff --git a/src/index.ts b/src/index.ts
index 73da76a..bfb1ba9 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,19 +1,34 @@
-import {layoutOnNetwork} from "./composables/LayoutMain";
-import {Network, GraphStyleProperties, Node,Link, NodeStyle} from "./types/TypeVizCore";
-import { defaultParameters } from "./types/Parameters";
+// Type imports
+import type {Network, GraphStyleProperties, Node,Link, NodeStyle} from "./types/TypeVizCore";
+import type { Parameters } from "./types/Parameters";
+
+// Enum imports
import { PathType,StartNodesType } from "./types/EnumArgs";
-export {layoutOnNetwork as algorithmOnNetwork};
+// Variable imports
+import { defaultParameters } from "./types/Parameters";
+// Function imports
+import {layoutOnNetwork} from "./composables/LayoutMain";
+
+/********************************************************************/
+
+// Type export
export type {
Network,
GraphStyleProperties,
Node,
Link,
NodeStyle,
- PathType,
- StartNodesType
+ Parameters,
};
+// Enum export
+export { PathType,
+ StartNodesType}
+
+// Variable export
export {defaultParameters};
-
\ No newline at end of file
+
+// Function export
+export {layoutOnNetwork};
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 2a5c28a..4e7f312 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,14 +1,16 @@
{
"compilerOptions": {
/* Language and Environment */
- "target": "es2016",
+ //"target": "es2016",
/* Modules */
- "module": "commonjs",
+ //"module": "commonjs",
+ "module": "ES6", // ou "ESNext" selon ton besoin
+ "target": "ES5", // ou ES6, selon ta compatibilité
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
/* Type Checking */
"strict": true,
"skipLibCheck": true,
- "outDir": "dist"
+ "outDir": "dist",
}
}
--
GitLab
From 582fdd1295e7a4cab41ca1fdfbbb5a1b61006401 Mon Sep 17 00:00:00 2001
From: Elora-V <elora95.vigo@gmail.com>
Date: Mon, 30 Sep 2024 11:53:19 +0200
Subject: [PATCH 4/7] reformat index.ts
---
src/index.ts | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/index.ts b/src/index.ts
index 73da76a..a808528 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,19 +1,34 @@
+// Function import
import {layoutOnNetwork} from "./composables/LayoutMain";
+
+// Type import
import {Network, GraphStyleProperties, Node,Link, NodeStyle} from "./types/TypeVizCore";
+
+// Variable import
import { defaultParameters } from "./types/Parameters";
+
+// Enum import
import { PathType,StartNodesType } from "./types/EnumArgs";
-export {layoutOnNetwork as algorithmOnNetwork};
+//************************************************************/
+
+
+// Function export
+export {layoutOnNetwork};
+
+// Type export
export type {
Network,
GraphStyleProperties,
Node,
Link,
NodeStyle,
- PathType,
- StartNodesType
};
+// Variable import
export {defaultParameters};
+
+// Enum export
+export{ PathType, StartNodesType};
\ No newline at end of file
--
GitLab
From c7fe54ccc9ee929314e5d64992aea9eee4f5287c Mon Sep 17 00:00:00 2001
From: Elora-V <elora95.vigo@gmail.com>
Date: Mon, 30 Sep 2024 16:38:55 +0200
Subject: [PATCH 5/7] pull package.lock
---
package-lock.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index b949f5e..e720393 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
{
- "name": "@metabohub/viz-layout",
+ "name": "@metabohub/metabolic-layout",
"version": "0.0.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
- "name": "@metabohub/viz-layout",
+ "name": "@metabohub/metabolic-layout",
"version": "0.0.0",
"license": "Apache-2.0",
"dependencies": {
--
GitLab
From 5b09a9c4c444f7f62b586f1a565c8ed7dc9fc269 Mon Sep 17 00:00:00 2001
From: Elora-V <elora95.vigo@gmail.com>
Date: Tue, 1 Oct 2024 08:31:38 +0200
Subject: [PATCH 6/7] test echo npmrc dans cicd
---
.gitlab-ci.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e721fc7..8ec874d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,9 @@ include:
- apt-get update && apt-get install -y git default-jre
- npm install
- npm run build
+ - echo "@metabohub:registry=https://forgemia.inra.fr/api/v4/packages/npm/">.npmrc
+ - echo "//forgemia.inra.fr/api/v4/projects/${CI_PROJECT_ID}/packages/npm/:_authToken=${CI_JOB_TOKEN}">>.npmrc
+
test:
image: node:latest
--
GitLab
From 57f1f61cecc53574770f96144d702c519b9593d6 Mon Sep 17 00:00:00 2001
From: Elora-V <elora95.vigo@gmail.com>
Date: Tue, 1 Oct 2024 08:38:02 +0200
Subject: [PATCH 7/7] returning to commonjs
---
package.json | 1 -
tsconfig.json | 6 ++----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index 5303de3..685d145 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,6 @@
"name": "@metabohub/viz-layout",
"version": "0.0.0",
"private": false,
- "type": "module",
"scripts": {
"build": "tsup",
"test": "jest"
diff --git a/tsconfig.json b/tsconfig.json
index 4e7f312..c9a3040 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,11 +1,9 @@
{
"compilerOptions": {
/* Language and Environment */
- //"target": "es2016",
+ "target": "es2016",
/* Modules */
- //"module": "commonjs",
- "module": "ES6", // ou "ESNext" selon ton besoin
- "target": "ES5", // ou ES6, selon ta compatibilité
+ "module": "commonjs",
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
/* Type Checking */
--
GitLab