oc-template-react-compiler 6.0.2 → 6.0.3

package/dist/lib/reactOCProviderTemplate.d.ts

@@ -1,3 +1,4 @@
-export default function reactOCProviderTemplate({ viewPath }: {
+export default function reactOCProviderTemplate({ viewPath, providerFunctions }: {
     viewPath: string;
+    providerFunctions: string;
 }): string;

package/dist/lib/reactOCProviderTemplate.js

@@ -1,56 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const removeExtension = (path) => path.replace(/\.(t|j)sx?$/, '');
-function reactOCProviderTemplate({ viewPath }) {
+function reactOCProviderTemplate({ viewPath, providerFunctions }) {
     return `
   import React from 'react';
   import View from '${removeExtension(viewPath)}';
   import { DataProvider } from 'oc-template-react-compiler/dist/utils/useData'
 
-  class OCProvider extends React.Component {
-    componentDidMount(){
-      const { _staticPath, _baseUrl, _componentName, _componentVersion, ...rest } = (this.props as any);
-      (window as any).oc.events.fire('oc:componentDidMount',  rest);
-    }
+  function OCProvider(props) {
+    const { _staticPath, _baseUrl, _componentName, _componentVersion, ...rest } = props;
 
-    getData(providerProps: any, parameters: any, cb: (error: any, parameters?: any, props?: any) => void) {
-      return (window as any).oc.getData({
-        name: providerProps._componentName,
-        version: providerProps._componentVersion,
-        baseUrl: providerProps._baseUrl,
-        parameters
-      }, (err: any, data: any) => {
-        if (err) {
-          return cb(err);
-        }
-        const { _staticPath, _baseUrl, _componentName, _componentVersion, ...rest } = (data.component.props as any); 
-        cb(null, rest, data.component.props);
-      });
-    }
+    React.useEffect(() => {
+      window.oc.events.fire('oc:componentDidMount', rest);
+    }, []);
 
-    getSetting(providerProps: any, setting: string) {
-      const settingHash = {
-        name: providerProps._componentName,
-        version: providerProps._componentVersion,
-        baseUrl: providerProps._baseUrl,
-        staticPath: providerProps._staticPath
-      };
-      return (settingHash as any)[setting];
-    }
+    ${providerFunctions}
+   
+    rest.getData = getData;
+    rest.getSetting = getSetting;
 
-    render() {
-      const { _staticPath, _baseUrl, _componentName, _componentVersion, ...rest } = (this.props as any);
-      (rest as any).getData = (parameters: any, cb: (error: any, parameters?: any, props?: any) => void) => this.getData(this.props, parameters, cb);
-      (rest as any).getSetting = (setting: string) => this.getSetting(this.props, setting);
-      return (
-        <DataProvider value={{...rest}}>
-          <View { ...rest } />
-        </DataProvider>
-      );
-    }
+    return (
+      <DataProvider value={{...rest}}>
+        <View { ...rest } />
+      </DataProvider>
+    );
   }
 
-  function renderer(props, element, ssr) {
+  export default function renderer(props, element, ssr) {
     if (window.ReactDOM.createRoot) {
       if (ssr) {
         window.ReactDOM.hydrateRoot(element, <OCProvider {...props} />);
@@ -65,8 +41,6 @@ function reactOCProviderTemplate({ viewPath }) {
       }
     }
   }
-
-  export default renderer;
 `;
 }
 exports.default = reactOCProviderTemplate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-template-react-compiler",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "Compiler for the React OC template",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,7 +31,7 @@
   "dependencies": {
     "@vitejs/plugin-react": "^4.0.0",
     "oc-template-react": "^4.0.0",
-    "oc-vite-compiler": "^3.2.0",
+    "oc-vite-compiler": "^3.3.0",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },

package/scaffold/src/package.json

@@ -35,7 +35,7 @@
     "@types/react": "^18.0.28",
     "jsdom": "^21.1.1",
     "oc-server": "*",
-    "oc-template-react-compiler": "6.0.0",
+    "oc-template-react-compiler": "^6.0.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "typescript": "5.1.3",