Update deps and ESM fix

.eslintrc.yml

@@ -1,8 +1,7 @@
 extends:
+  - cheminfo-typescript
   - cheminfo-react
   - plugin:storybook/recommended
 rules:
   react/jsx-no-bind: off
   consistent-return: off
-env:
-  jest: true

.github/workflows/nodejs.yml

@@ -10,3 +10,5 @@ jobs:
   nodejs:
     # Documentation: https://github.com/zakodium/workflows#nodejs-ci
     uses: zakodium/workflows/.github/workflows/nodejs.yml@nodejs-v1
+    with:
+      lint-check-types: true

.storybook/main.js → .storybook/main.mjs

@@ -1,15 +1,21 @@
-module.exports = {
-  stories: ['../stories/**/*.stories.js'],
+export default {
+  stories: ['../stories/**/*.stories.tsx'],
+
   addons: [
     '@storybook/addon-storysource',
     '@storybook/addon-links',
     '@storybook/addon-essentials',
   ],
+
   framework: {
-    name: '@storybook/react-webpack5',
+    name: '@storybook/react-vite',
     options: {
       fastRefresh: true,
       strictMode: true,
     },
   },
+
+  typescript: {
+    reactDocgen: 'react-docgen-typescript',
+  },
 };

README.md

@@ -49,7 +49,7 @@ This library is available in three versions, like openchemlib: `react-ocl/minima
 
 ## Documentation
 
-See https://zakodium-oss.github.io/react-ocl/ for detailed usage examples.
+See https://react-ocl.pages.dev for detailed usage examples.
 
 [npm-image]: https://img.shields.io/npm/v/react-ocl.svg
 [npm-url]: https://npmjs.org/package/react-ocl

base.cjs

@@ -0,0 +1,14 @@
+'use strict';
+
+const BaseIdcodeSvgRenderer =
+  require('./lib-cjs/components/IdcodeSvgRenderer.js').default;
+const BaseMolfileSvgRenderer =
+  require('./lib-cjs/components/MolfileSvgRenderer.js').default;
+const BaseSmilesSvgRenderer =
+  require('./lib-cjs/components/SmilesSvgRenderer.js').default;
+
+module.exports = {
+  SmilesSvgRenderer: BaseSmilesSvgRenderer,
+  MolfileSvgRenderer: BaseMolfileSvgRenderer,
+  IdcodeSvgRenderer: BaseIdcodeSvgRenderer,
+};

base.d.ts

@@ -1,24 +1,12 @@
-import {
-  IIdcodeSvgRendererProps as IdcodeProps,
-  IMolfileSvgRendererProps as MolfileProps,
-  ISmilesSvgRendererProps as SmilesProps,
-} from './types';
-
-export interface IIdcodeSvgRendererProps extends IdcodeProps {
-  OCL: any;
-}
-export function IdcodeSvgRenderer(
-  props: IIdcodeSvgRendererProps,
-): JSX.Element;
-
-export interface IMolfileSvgRendererProps extends MolfileProps {
-  OCL: any;
-}
-export function MolfileSvgRenderer(
-  props: IMolfileSvgRendererProps,
-): JSX.Element;
-
-export interface ISmilesSvgRendererProps extends SmilesProps {
-  OCL: any;
-}
-export function SmilesSvgRenderer(props: ISmilesSvgRendererProps): JSX.Element;
+export {
+  type BaseIdcodeSvgRendererProps,
+  default as BaseIdcodeSvgRenderer,
+} from './lib/components/IdcodeSvgRenderer.d.ts';
+export {
+  type BaseMolfileSvgRendererProps,
+  default as BaseMolfileSvgRenderer,
+} from './lib/components/MolfileSvgRenderer.d.ts';
+export {
+  type BaseSmilesSvgRendererProps,
+  default as BaseSmilesSvgRenderer,
+} from './lib/components/SmilesSvgRenderer.d.ts';

base.mjs

@@ -1,6 +1,6 @@
-import BaseIdcodeSvgRenderer from './lib/components/IdcodeSvgRenderer';
-import BaseMolfileSvgRenderer from './lib/components/MolfileSvgRenderer';
-import BaseSmilesSvgRenderer from './lib/components/SmilesSvgRenderer';
+import BaseIdcodeSvgRenderer from './lib/components/IdcodeSvgRenderer.js';
+import BaseMolfileSvgRenderer from './lib/components/MolfileSvgRenderer.js';
+import BaseSmilesSvgRenderer from './lib/components/SmilesSvgRenderer.js';
 
 export {
   BaseSmilesSvgRenderer as SmilesSvgRenderer,

core.js → core.cjs

@@ -1,12 +1,14 @@
+'use strict';
+
 const OCL = require('openchemlib/core');
 const React = require('react');
 
-const BaseIdcodeSvgRenderer = require('./lib-cjs/components/IdcodeSvgRenderer')
-  .default;
-const BaseMolfileSvgRenderer = require('./lib-cjs/components/MolfileSvgRenderer')
-  .default;
-const BaseSmilesSvgRenderer = require('./lib-cjs/components/SmilesSvgRenderer')
-  .default;
+const BaseIdcodeSvgRenderer =
+  require('./lib-cjs/components/IdcodeSvgRenderer.js').default;
+const BaseMolfileSvgRenderer =
+  require('./lib-cjs/components/MolfileSvgRenderer.js').default;
+const BaseSmilesSvgRenderer =
+  require('./lib-cjs/components/SmilesSvgRenderer.js').default;
 
 function SmilesSvgRenderer(props) {
   return React.createElement(BaseSmilesSvgRenderer, { OCL, ...props });

core.d.ts

@@ -1 +1 @@
-export * from './minimal';
+export * from './minimal.d.ts';

core.mjs

@@ -1,9 +1,9 @@
 import OCL from 'openchemlib/core';
 import React from 'react';
 
-import BaseIdcodeSvgRenderer from './lib/components/IdcodeSvgRenderer';
-import BaseMolfileSvgRenderer from './lib/components/MolfileSvgRenderer';
-import BaseSmilesSvgRenderer from './lib/components/SmilesSvgRenderer';
+import BaseIdcodeSvgRenderer from './lib/components/IdcodeSvgRenderer.js';
+import BaseMolfileSvgRenderer from './lib/components/MolfileSvgRenderer.js';
+import BaseSmilesSvgRenderer from './lib/components/SmilesSvgRenderer.js';
 
 export function SmilesSvgRenderer(props) {
   return React.createElement(BaseSmilesSvgRenderer, { OCL, ...props });

full.js → full.cjs

@@ -1,14 +1,16 @@
+'use strict';
+
 const OCL = require('openchemlib/full');
 const React = require('react');
 
-const BaseIdcodeSvgRenderer = require('./lib-cjs/components/IdcodeSvgRenderer')
-  .default;
-const BaseMolfileSvgRenderer = require('./lib-cjs/components/MolfileSvgRenderer')
-  .default;
-const BaseSmilesSvgRenderer = require('./lib-cjs/components/SmilesSvgRenderer')
-  .default;
-const BaseStructureEditor = require('./lib-cjs/components/StructureEditor')
-  .default;
+const BaseIdcodeSvgRenderer =
+  require('./lib-cjs/components/IdcodeSvgRenderer.js').default;
+const BaseMolfileSvgRenderer =
+  require('./lib-cjs/components/MolfileSvgRenderer.js').default;
+const BaseSmilesSvgRenderer =
+  require('./lib-cjs/components/SmilesSvgRenderer.js').default;
+const BaseStructureEditor =
+  require('./lib-cjs/components/StructureEditor.js').default;
 
 function SmilesSvgRenderer(props) {
   return React.createElement(BaseSmilesSvgRenderer, { OCL, ...props });

full.d.ts

@@ -1,2 +1,5 @@
 export * from './core';
-export { IStructureEditorProps, StructureEditor } from './types';
+export {
+  type StructureEditorProps,
+  default as StructureEditor,
+} from './src/components/StructureEditor';

full.mjs

@@ -1,11 +1,11 @@
 import OCL from 'openchemlib/full';
 import React from 'react';
 
-import BaseIdcodeSvgRenderer from './lib/components/IdcodeSvgRenderer';
-import BaseMolfileSvgRenderer from './lib/components/MolfileSvgRenderer';
-import BaseSmilesSvgRenderer from './lib/components/SmilesSvgRenderer';
+import BaseIdcodeSvgRenderer from './lib/components/IdcodeSvgRenderer.js';
+import BaseMolfileSvgRenderer from './lib/components/MolfileSvgRenderer.js';
+import BaseSmilesSvgRenderer from './lib/components/SmilesSvgRenderer.js';
 
-export { default as StructureEditor } from './lib/components/StructureEditor';
+export { default as StructureEditor } from './lib/components/StructureEditor.js';
 
 export function SmilesSvgRenderer(props) {
   return React.createElement(BaseSmilesSvgRenderer, { OCL, ...props });

minimal.cjs

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('./lib-cjs/index.js');

minimal.d.ts

@@ -1,9 +1,9 @@
 export {
-  IBaseSvgRendererProps,
-  IIdcodeSvgRendererProps,
-  IMolfileSvgRendererProps,
-  ISmilesSvgRendererProps,
+  type BaseSvgRendererProps,
+  type IdcodeSvgRendererProps,
   IdcodeSvgRenderer,
+  type MolfileSvgRendererProps,
   MolfileSvgRenderer,
+  type SmilesSvgRendererProps,
   SmilesSvgRenderer,
-} from './types';
+} from './lib/index.d.ts';

minimal.mjs

@@ -1 +1 @@
-export * from './lib/index';
+export * from './lib/index.js';