oc-template-elm-compiler 0.2.1 → 0.2.3

package/dist/lib/elmOCProviderTemplate.d.ts

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

package/dist/lib/elmOCProviderTemplate.js

@@ -2,35 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const extractName = (path) => path.match(/(\w+)\.elm$/)[1];
 const removeJsExtension = (path) => path.replace(/\.(t|j)s?$/, '');
-function elmEntry({ viewPath }) {
+function elmEntry({ viewPath, providerFunctions }) {
     return `
   import { Elm } from '${viewPath}';
 
-  function getData(providerProps, parameters, cb) {
-    return window.oc.getData({
-      name: providerProps._componentName,
-      version: providerProps._componentVersion,
-      baseUrl: providerProps._baseUrl,
-      parameters
-    }, (err, data) => {
-      if (err) {
-        return cb(err);
-      }
-      const { _staticPath, _baseUrl, _componentName, _componentVersion, ...rest } = data.component.props; 
-      cb(null, rest);
-    });
-  }
-
-  function renderer(model, node) {
-    const { _baseUrl, _componentName, _componentVersion, _staticPath, ...props } = model;
+  function renderer(props, node) {
+    const { _baseUrl, _componentName, _componentVersion, _staticPath, ...rest } = props;
     const app = Elm["${extractName(viewPath)}"].init({
       node,
-      flags: props
+      flags: rest
     })
 
+    ${providerFunctions}
+
     if (app.ports && app.ports.getData) {
       app.ports.getData.subscribe(parameters => {
-        getData({ _baseUrl, _componentName, _componentVersion }, parameters, (err, data) => {
+        getData(parameters, (err, data) => {
           if (err && process.env.NODE_ENV !== 'production') {
             console.error('Error requesting OC Data', err);
           }
@@ -44,10 +31,12 @@ function elmEntry({ viewPath }) {
     return app;
   }
 
+  renderer.component = Elm["${extractName(viewPath)}"];
+
   export default renderer;
 `;
 }
-function jsEntry({ viewPath }) {
+function jsEntry({ viewPath, providerFunctions }) {
     return `
   import config from '${removeJsExtension(viewPath)}';
   const { js, program } = config;
@@ -55,28 +44,15 @@ function jsEntry({ viewPath }) {
   if (!program) throw new Error('Missing program in config');
   if (!program.init) throw new Error('Program does not look like an elm instance (missing init)');
 
-  function getData(providerProps, parameters, cb) {
-    return window.oc.getData({
-      name: providerProps._componentName,
-      version: providerProps._componentVersion,
-      baseUrl: providerProps._baseUrl,
-      parameters
-    }, (err, data) => {
-      if (err) {
-        return cb(err);
-      }
-      const { _staticPath, _baseUrl, _componentName, _componentVersion, ...rest } = data.component.props; 
-      cb(null, rest);
-    });
-  }
-
-  function renderer(model, node) {
-    const { _baseUrl, _componentName, _componentVersion, _staticPath, ...props } = model;
+  function renderer(props, node) {
+    const { _baseUrl, _componentName, _componentVersion, _staticPath, ...rest } = props;
     const app = program.init({
       node,
-      flags: props
+      flags: rest
     })
 
+    ${providerFunctions}
+
     if (app.ports && app.ports.getData) {
       app.ports.getData.subscribe(parameters => {
         getData({ _baseUrl, _componentName, _componentVersion }, parameters, (err, data) => {
@@ -95,13 +71,15 @@ function jsEntry({ viewPath }) {
     return app;
   }
 
+  renderer.component = program;
+
   export default renderer;
 `;
 }
-function elmOCProviderTemplate({ viewPath }) {
+function elmOCProviderTemplate({ viewPath, providerFunctions }) {
     if (viewPath.endsWith('.elm')) {
-        return elmEntry({ viewPath });
+        return elmEntry({ viewPath, providerFunctions });
     }
-    return jsEntry({ viewPath });
+    return jsEntry({ viewPath, providerFunctions });
 }
 exports.default = elmOCProviderTemplate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-template-elm-compiler",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Compiler for the Elm OC template",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,8 +30,8 @@
   "license": "MIT",
   "dependencies": {
     "elm": "^0.19.1-6",
-    "oc-template-elm": "^0.1.0",
-    "oc-vite-compiler": "^3.2.0",
+    "oc-template-elm": "0.1.1",
+    "oc-vite-compiler": "^3.4.0",
     "vite-plugin-elm": "^2.8.0"
   },
   "files": [