oc-template-elm-compiler 0.1.0-beta.1 → 0.1.0-beta.3

package/dist/lib/compile.js

@@ -16,7 +16,7 @@ exports.compile = (0, oc_generic_template_compiler_1.createCompile)({
         ...options,
         plugins: [(0, vite_plugin_elm_1.default)()],
         viewWrapper: ({ viewPath }) => (0, elmOCProviderTemplate_1.default)({ viewPath, jsPath: undefined }),
-        htmlTemplate: (props) => (0, htmlTemplate_1.default)({ ...props, bundleName: 'dontknow' }),
+        htmlTemplate: htmlTemplate_1.default,
         externals: (0, oc_template_elm_1.getInfo)().externals
     }, cb),
     compileServer: oc_vite_compiler_1.viteServer,

package/dist/lib/elmOCProviderTemplate.js

@@ -17,14 +17,13 @@ function elmOCProviderTemplate({ jsPath, viewPath }) {
       if (err) {
         return cb(err);
       }
-      const { _staticPath, _baseUrl, _componentName, _componentVersion, ...rest } = data.elmComponent.flags; 
+      const { _staticPath, _baseUrl, _componentName, _componentVersion, ...rest } = data.component.props; 
       cb(null, rest);
     });
   }
 
   function renderer(model, node) {
     const { _baseUrl, _componentName, _componentVersion, _staticPath, ...props } = model;
-    const app = Component.Elm["${extractName(viewPath)}"].init({ node, flags });
     const app = Elm["${extractName(viewPath)}"].init({
       node,
       flags: props
@@ -48,7 +47,7 @@ function elmOCProviderTemplate({ jsPath, viewPath }) {
     return app;
   }
 
-  export default init;
+  export default renderer;
 `;
 }
 exports.default = elmOCProviderTemplate;

package/dist/lib/htmlTemplate.d.ts

@@ -1,6 +1,6 @@
-export default function viewTemplate({ templateId, css, hash, bundleName }: {
+export default function viewTemplate({ templateId, css, hash, bundle }: {
     templateId: string;
     css: string;
     hash: string;
-    bundleName: string;
+    bundle: string;
 }): string;

package/dist/lib/htmlTemplate.js

@@ -4,11 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const cssesc_1 = __importDefault(require("cssesc"));
-function viewTemplate({ templateId, css, hash, bundleName }) {
-    return `function elmViewTemplate(model) {
+function viewTemplate({ templateId, css, hash, bundle }) {
+    return `function(model){
+  oc.elmComponents = oc.elmComponents || {};
+  oc.elmComponents['${hash}'] = oc.elmComponents['${hash}'] || (${bundle});
+  if (!model) return;
   var modelHTML =  model.__html ? model.__html : '';
-  var staticPath = model.component.flags._staticPath;
-  var flags = JSON.stringify(model.component.flags);
+  var staticPath = model.component.props._staticPath;
+  var props = JSON.stringify(model.component.props);
   window.oc = window.oc || {};
   window.oc.__elmTemplate = window.oc.__elmTemplate || { count: 0 };
   var count = window.oc.__elmTemplate.count;
@@ -19,17 +22,12 @@ function viewTemplate({ templateId, css, hash, bundleName }) {
     '<script>' +
     'window.oc = window.oc || {};' +
     'oc.cmd = oc.cmd || [];' +
+
     'oc.cmd.push(function(oc){' +
     '${css ? "oc.events.fire(\\'oc:cssDidMount\\', \\'" + css + "\\');" : ''}' +
-      'oc.require(' +
-        '["oc", "elmComponents", "${hash}"],' + 
-        '"' + staticPath + '${bundleName}.js",' +
-        'function(ElmComponent) {' +
-          'var targetNode = document.getElementById("' + templateId + '");' +
-          'targetNode.setAttribute("id","");' +
-          'ElmComponent({ node: targetNode, flags:' + flags + '});' +
-        '}' +
-      ');' +
+      'var targetNode = document.getElementById("' + templateId + '");' +
+      'targetNode.setAttribute("id","");' +
+      'oc.elmComponents["${hash}"](' + props + ', targetNode);' +
     '});' +
   '</script>'
 }`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-template-elm-compiler",
-  "version": "0.1.0-beta.1",
+  "version": "0.1.0-beta.3",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -36,6 +36,7 @@
     "oc-statics-compiler": "2.0.10",
     "oc-template-elm": "0.1.0",
     "oc-view-wrapper": "1.0.3",
+    "oc-vite-compiler": "^3.0.0",
     "resolve": "1.18.1",
     "vite-plugin-elm": "^2.8.0"
   },