oc-template-preact-compiler 0.4.0 → 0.4.2

package/dist/utils/useData.d.ts

@@ -2,6 +2,6 @@ type PromiseData<T = any> = T & {
     getData<O = any>(parameters?: Partial<T>): Promise<O>;
     getSetting(setting: 'name' | 'version' | 'baseUrl' | 'staticPath'): string;
 };
-export declare const DataProvider: ({ children, ...props }: any) => import("react/jsx-runtime").JSX.Element;
+export declare const DataProvider: ({ children, ...props }: any) => import("preact").JSX.Element;
 export declare function useData<T = any>(): PromiseData<T>;
 export {};

package/dist/utils/useData.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useData = exports.DataProvider = void 0;
-const jsx_runtime_1 = require("react/jsx-runtime");
+const jsx_runtime_1 = require("preact/jsx-runtime");
 const preact_1 = require("preact");
 const hooks_1 = require("preact/hooks");
 const DataContext = (0, preact_1.createContext)({});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-template-preact-compiler",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Compiler for the Preact OC template",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,9 +28,9 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@preact/preset-vite": "^2.5.0",
+    "@preact/preset-vite": "^2.7.0",
     "oc-template-preact": "^0.1.1",
-    "oc-vite-compiler": "^3.5.0",
+    "oc-vite-compiler": "^3.5.2",
     "preact": "^10"
   },
   "peerDependencies": {

package/scaffold/src/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "base-component-react",
+  "name": "base-component-preact",
   "description": "",
   "version": "1.0.0",
   "scripts": {
@@ -30,11 +30,12 @@
   },
   "dependencies": {},
   "devDependencies": {
+    "@preact/preset-vite": "^2.7.0",
     "@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",
+    "oc-server": "^0.3.0",
+    "oc-template-preact-compiler": "^0.4.1",
     "preact": "^10.13.2",
     "typescript": "5.0.2",
     "vitest": "^0.29.7"

package/scaffold/src/src/App.tsx

@@ -1,23 +1,21 @@
 import { useState } from 'preact/hooks';
-import { useData } from 'oc-template-preact-compiler/dist/utils/useData';
-import { serverClient } from 'oc-server';
+import { ActionOutput, InitialData, serverClient } from 'oc-server';
 import styles from './styles.css';
-import type { AdditionalData, ClientProps } from './types';
+import logo from '../public/logo.png';
 
-interface AppProps extends ClientProps {
-  getMoreData?: boolean;
-}
+type AdditionalData = ActionOutput<'funFact'>;
 
-const App = () => {
-  const { firstName, lastName, userId, getData, getSetting } = useData<AppProps>();
-  const staticPath = getSetting('staticPath');
-  const [additionalData, setAdditionalData] = useState<AdditionalData | null>(null);
+const App = (props: InitialData) => {
+  const { firstName, lastName, born, hobbies } = props;
+  const [additionalData, setAdditionalData] = useState<AdditionalData | null>(
+    null
+  );
   const [error, setError] = useState('');
 
-  const fetchMoreData = async () => {
+  const getFunFact = async () => {
     setError('');
     try {
-      const data = await serverClient.getMoreData({ userId });
+      const data = await serverClient.funFact({ year: born });
       setAdditionalData(data);
     } catch (err) {
       setError(String(err));
@@ -30,20 +28,20 @@ const App = () => {
 
   return (
     <div className={styles.container}>
-      <img width="50" height="50" src={`${staticPath}/public/logo.png`} alt="Logo" />
+      <img width="50" height="50" src={logo} alt="Logo" />
       <h1 style={{ margin: '0 0 20px 0' }}>
-        Hello, <span style={{ textDecoration: 'underline' }}>{firstName}</span> {lastName}
+        Hello, <span style={{ textDecoration: 'underline' }}>{firstName}</span>{' '}
+        {lastName}
       </h1>
-      {additionalData && (
-        <div className={styles.info}>
-          <div className={styles.block}>Age: {additionalData.age}</div>
-          <div className={styles.block}>
-            Hobbies: {additionalData.hobbies.map((x) => x.toLowerCase()).join(', ')}
-          </div>
+      <div className={styles.info}>
+        <div className={styles.block}>Born: {born}</div>
+        <div className={styles.block}>
+          Hobbies: {hobbies.map((x) => x.toLowerCase()).join(', ')}
         </div>
-      )}
-      <button className={styles.button} onClick={fetchMoreData}>
-        Get extra information
+      </div>
+      {additionalData && <div>{additionalData.funFact}</div>}
+      <button className={styles.button} onClick={getFunFact}>
+        Fun year fact
       </button>
     </div>
   );

package/scaffold/src/src/server.ts

@@ -1,30 +1,45 @@
 import { Server } from 'oc-server';
-import { AdditionalData, ClientProps, OcParameters } from './types';
 
-const database = [
-  { name: 'John Doe', age: 34, hobbies: ['Swimming', 'Basketball'] },
-  { name: 'Jane Doe', age: 35, hobbies: ['Running', 'Rugby'] }
+const userDatabase = [
+  { name: 'John Doe', born: 1986, hobbies: ['Swimming', 'Basketball'] },
+  { name: 'Jane Doe', born: 1991, hobbies: ['Running', 'Rugby'] },
 ];
 
+const yearsFunFactDatabase: Record<number, string> = {
+  1986: "Halley's Comet made its closest approach to Earth in 1986, visible to the naked eye.",
+  1987: 'The first Final Fantasy game was released in 1987.',
+  1991: 'The first web page was created in 1991 by Tim Berners-Lee.',
+};
+
 async function getUser(userId: number) {
-  return database[userId];
+  return userDatabase[userId];
+}
+
+async function getFunFact(year: number) {
+  return yearsFunFactDatabase[year];
 }
 
-export const server = new Server(async (params: OcParameters): Promise<ClientProps> => {
-  const user = await getUser(params.userId);
+export const server = new Server(async (params: { userId: number }) => {
+  const { userId } = params;
+  const user = await getUser(userId);
   const [firstName, lastName] = user.name.split(/\s+/);
 
+  if (firstName === 'Invalid') {
+    return;
+  }
+
   return {
-    userId: params.userId,
     firstName,
-    lastName
+    lastName,
+    born: user.born,
+    hobbies: user.hobbies,
   };
-}).action('getMoreData', async (params: OcParameters): Promise<AdditionalData> => {
-  const user = await getUser(params.userId);
+}).action('funFact', async (params: { year: number }) => {
+  const { year } = params;
+  const funFact = await getFunFact(year);
 
   return {
-    age: user.age,
-    hobbies: user.hobbies
+    funFact,
   };
 });
 

package/scaffold/src/tsconfig.json

@@ -20,7 +20,11 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "react-jsx",
-    "jsxImportSource": "preact"
+    "jsxImportSource": "preact",
+    "paths": {
+      "react": ["./node_modules/preact/compat/"],
+      "react-dom": ["./node_modules/preact/compat/"]
+    }
   },
   "include": ["src"],
   "exclude": ["src/_package"]