@datagrok/helm 2.5.4 → 2.5.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +4 -0
- package/dist/package-test.js +1 -1
- package/dist/package-test.js.map +1 -1
- package/dist/package.js +1 -1
- package/dist/package.js.map +1 -1
- package/package.json +11 -11
- package/src/helm-helper.ts +2 -1
- package/src/tests/parse-helm-tests.ts +3 -3
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@datagrok/helm",
|
|
3
3
|
"friendlyName": "Helm",
|
|
4
|
-
"version": "2.5.
|
|
4
|
+
"version": "2.5.5",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Aleksandr Tanas",
|
|
7
7
|
"email": "atanas@datagrok.ai"
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"dayjs": "^1.10.6",
|
|
25
25
|
"lru-cache": "^10.4.3",
|
|
26
26
|
"rxjs": "^6.5.5",
|
|
27
|
-
"wu": "
|
|
27
|
+
"wu": "^2.1.0"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"@datagrok-libraries/helm-web-editor": "^1.1.12",
|
|
@@ -33,18 +33,18 @@
|
|
|
33
33
|
"@datagrok/chem": "^1.12.3",
|
|
34
34
|
"@types/node": "17.0.45",
|
|
35
35
|
"@types/webpack-env": "^1.18.5",
|
|
36
|
-
"@types/wu": "
|
|
36
|
+
"@types/wu": "^2.1.44",
|
|
37
37
|
"@typescript-eslint/eslint-plugin": "^7.16.0",
|
|
38
38
|
"@typescript-eslint/parser": "^7.16.0",
|
|
39
39
|
"datagrok-tools": "latest",
|
|
40
|
-
"eslint": "
|
|
41
|
-
"eslint-config-google": "
|
|
42
|
-
"eslint-plugin-deprecation": "
|
|
43
|
-
"eslint-plugin-rxjs": "
|
|
40
|
+
"eslint": "^8.57.1",
|
|
41
|
+
"eslint-config-google": "^0.14.0",
|
|
42
|
+
"eslint-plugin-deprecation": "^3.0.0",
|
|
43
|
+
"eslint-plugin-rxjs": "^5.0.3",
|
|
44
44
|
"path": "^0.12.7",
|
|
45
|
-
"source-map-loader": "
|
|
46
|
-
"ts-loader": "
|
|
47
|
-
"typescript": "
|
|
45
|
+
"source-map-loader": "^5.0.0",
|
|
46
|
+
"ts-loader": "^9.5.1",
|
|
47
|
+
"typescript": "^5.6.3",
|
|
48
48
|
"webpack": "^5.76.3",
|
|
49
49
|
"webpack-cli": "^4.9.1"
|
|
50
50
|
},
|
|
@@ -79,4 +79,4 @@
|
|
|
79
79
|
"directory": "packages/Helm"
|
|
80
80
|
},
|
|
81
81
|
"category": "Bioinformatics"
|
|
82
|
-
}
|
|
82
|
+
}
|
package/src/helm-helper.ts
CHANGED
|
@@ -261,7 +261,8 @@ export class HelmHelper implements IHelmHelper {
|
|
|
261
261
|
const logPrefixInt = `${logPrefix}, org.helm.webeditor.Monomers.getMonomer()`;
|
|
262
262
|
try {
|
|
263
263
|
// logger.debug(`${logPrefixInt}, a: ${JSON.stringify(a, helmJsonReplacer)}, name: '${name}'`);
|
|
264
|
-
|
|
264
|
+
if (name?.startsWith('[') && name.endsWith(']'))
|
|
265
|
+
name = name.substring(1, name.length - 1);
|
|
265
266
|
// Creates monomers in lib
|
|
266
267
|
const dgWem = monomerLib.getWebEditorMonomer(a, name);
|
|
267
268
|
|
|
@@ -50,8 +50,7 @@ category('parseHelm', () => {
|
|
|
50
50
|
|
|
51
51
|
libHelper = await getMonomerLibHelper();
|
|
52
52
|
|
|
53
|
-
|
|
54
|
-
'get user lib settings for backup');
|
|
53
|
+
userLibSettings = await getUserLibSettings();
|
|
55
54
|
|
|
56
55
|
// parseHelm is dependent on monomers RGroups available, test requires default monomer library
|
|
57
56
|
await libHelper.loadMonomerLibForTests();
|
|
@@ -71,7 +70,7 @@ category('parseHelm', () => {
|
|
|
71
70
|
for (const [testName, {src, tgt}] of Object.entries(testData)) {
|
|
72
71
|
test(`woDOM-${testName}`, async () => {
|
|
73
72
|
_testParseHelmWithoutDOM(src, tgt);
|
|
74
|
-
}
|
|
73
|
+
});
|
|
75
74
|
}
|
|
76
75
|
});
|
|
77
76
|
|
|
@@ -104,4 +103,5 @@ function _testParseHelmWithoutDOM(src: string, tgt: TestTgtType): void {
|
|
|
104
103
|
expect(m.atoms.length, tgt.atomCount);
|
|
105
104
|
expect(m.bonds.length, tgt.bondCount);
|
|
106
105
|
expect(resHelm, tgt.helm);
|
|
106
|
+
expect(m.atoms.every((a) => !a.elem.startsWith('[') && !a.elem.endsWith(']')), true, 'Atoms should not contain square braces.');
|
|
107
107
|
}
|