oc-template-preact-compiler 0.3.0-beta.1 → 0.3.0-beta.3

package/dist/lib/htmlTemplate.js

@@ -7,8 +7,8 @@ const cssesc_1 = __importDefault(require("cssesc"));
 function viewTemplate({ templateId, css, bundle, hash }) {
     return `function(model){
   var modelHTML =  model.__html ? model.__html : '';
-  var staticPath = model.preactComponent.props._staticPath;
-  var props = JSON.stringify(model.preactComponent.props);
+  var staticPath = model.component.props._staticPath;
+  var props = JSON.stringify(model.component.props);
   window.oc = window.oc || {};
   window.oc.__typescriptReactTemplate = window.oc.__typescriptReactTemplate || { count: 0 };
   oc.preactComponents = oc.preactComponents || {};

package/dist/lib/preactOCProviderTemplate.js

@@ -25,6 +25,7 @@ function preactOCProviderTemplate({ viewPath }) {
         if (err) {
           return cb(err);
         }
+        const { _staticPath, _baseUrl, _componentName, _componentVersion, ...rest } = data.component.props;
         cb(null, rest, data.component.props);
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-template-preact-compiler",
-  "version": "0.3.0-beta.1",
+  "version": "0.3.0-beta.3",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -35,7 +35,7 @@
     "immer": "^9.0.6",
     "oc-generic-template-compiler": "2.1.0",
     "oc-statics-compiler": "2.1.1",
-    "oc-template-preact": "*",
+    "oc-template-preact": "0.1.0-beta.0",
     "oc-vite-compiler": "3.0.0-beta.2",
     "preact": "^10",
     "resolve": "^1.20.0"

package/scaffold/src/package.json

@@ -33,6 +33,7 @@
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.4.3",
     "jsdom": "^21.1.1",
+    "oc-server": "*",
     "oc-template-preact-compiler": "0.2.0",
     "preact": "^10.13.2",
     "typescript": "5.0.2",

package/scaffold/src/src/App.tsx

@@ -1,5 +1,6 @@
 import { useState } from 'preact/hooks';
 import { useData } from 'oc-template-preact-compiler/dist/utils/useData';
+import { serverClient } from 'oc-server';
 import styles from './styles.css';
 import type { AdditionalData, ClientProps } from './types';
 
@@ -16,7 +17,7 @@ const App = () => {
   const fetchMoreData = async () => {
     setError('');
     try {
-      const data = await getData({ userId, getMoreData: true });
+      const data = await serverClient.getMoreData({ userId });
       setAdditionalData(data);
     } catch (err) {
       setError(String(err));

package/scaffold/src/src/server.ts

@@ -1,4 +1,4 @@
-import { Context } from 'oc-template-preact-compiler';
+import { Server } from 'oc-server';
 import { AdditionalData, ClientProps, OcParameters } from './types';
 
 const database = [
@@ -10,25 +10,26 @@ async function getUser(userId: number) {
   return database[userId];
 }
 
-export async function data(
-  context: Context<OcParameters>,
-  callback: (error: any, data: ClientProps | AdditionalData) => void
-) {
-  const { userId } = context.params;
-  const user = await getUser(userId);
-  const shouldGetMoreData = context.params.getMoreData;
+export const server = new Server(async (params: OcParameters): Promise<ClientProps> => {
+  const user = await getUser(params.userId);
   const [firstName, lastName] = user.name.split(/\s+/);
 
-  if (shouldGetMoreData) {
-    return callback(null, {
-      age: user.age,
-      hobbies: user.hobbies
-    });
-  }
-
-  return callback(null, {
-    userId,
+  return {
+    userId: params.userId,
     firstName,
     lastName
-  });
+  };
+}).action('getMoreData', async (params: OcParameters): Promise<AdditionalData> => {
+  const user = await getUser(params.userId);
+
+  return {
+    age: user.age,
+    hobbies: user.hobbies
+  };
+});
+
+declare module 'oc-server' {
+  interface Register {
+    server: typeof server;
+  }
 }