create-oc 0.0.7 → 0.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-oc",
-  "version": "0.0.7",
+  "version": "0.0.10",
   "type": "module",
   "description": "",
   "main": "index.js",

package/templates/react/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",

package/templates/react/src/App.tsx

@@ -1,23 +1,21 @@
 import { useState } from 'react';
-import { useData } from 'oc-template-react-compiler/dist/utils/useData';
-import { serverClient } from 'oc-server';
+import { serverClient, InitialData, ActionOutput } from 'oc-server';
 import styles from './styles.css';
 import logo from '../public/logo.png';
-import type { AdditionalData, ClientProps } from './types';
 
-interface AppProps extends ClientProps {
-  getMoreData?: boolean;
-}
+type AdditionalData = ActionOutput<'getMoreData'>;
 
-const App: React.FC<ClientProps> = () => {
-  const { firstName, lastName, userId, getData } = useData<AppProps>();
-  const [additionalData, setAdditionalData] = useState<AdditionalData | null>(null);
+const App: React.FC<InitialData> = (props: InitialData) => {
+  const { firstName, lastName, born, hobbies } = props;
+  const [additionalData, setAdditionalData] = useState<AdditionalData | null>(
+    null
+  );
   const [error, setError] = useState('');
 
   const fetchMoreData = async () => {
     setError('');
     try {
-      const data = await serverClient.getMoreData({ userId });
+      const data = await serverClient.getMoreData({ year: born });
       setAdditionalData(data);
     } catch (err) {
       setError(String(err));
@@ -32,18 +30,18 @@ const App: React.FC<ClientProps> = () => {
     <div className={styles.container}>
       <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>
-      )}
+      </div>
+      {additionalData && <div>{additionalData.funFact}</div>}
       <button className={styles.button} onClick={fetchMoreData}>
-        Get extra information
+        Fun year fact
       </button>
     </div>
   );

package/templates/react/src/server.ts

@@ -1,32 +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> => {
+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,
     firstName,
-    lastName
+    lastName,
+    born: user.born,
+    hobbies: user.hobbies,
   };
-}).action('getMoreData', async (params: OcParameters): Promise<AdditionalData> => {
-  const { userId } = params;
-  const user = await getUser(userId);
+}).action('getMoreData', async (params: { year: number }) => {
+  const { year } = params;
+  const funFact = await getFunFact(year);
 
   return {
-    age: user.age,
-    hobbies: user.hobbies
+    funFact,
   };
 });
 

package/templates/vue/package.json

@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "scripts": {
     "lint": "eslint --max-warnings 0 --ext .js,.jsx,.ts,.tsx src",
-    "build": "tsc --noEmit && oc package .",
+    "build": "vue-tsc --noEmit && oc package .",
     "test": "vitest"
   },
   "oc": {

package/templates/react/src/types.ts

@@ -1,15 +0,0 @@
-export interface OcParameters {
-  userId: number;
-  getMoreData?: boolean;
-}
-
-export interface AdditionalData {
-  hobbies: string[];
-  age: number;
-}
-
-export interface ClientProps extends Partial<AdditionalData> {
-  userId: number;
-  firstName: string;
-  lastName: string;
-}

package/templates/vue/src/HelloWorld.vue

@@ -1,38 +0,0 @@
-<script setup lang="ts">
-import { ref } from 'vue'
-
-defineProps<{ msg: string }>()
-
-const count = ref(0)
-</script>
-
-<template>
-  <h1>{{ msg }}</h1>
-
-  <div class="card">
-    <button type="button" @click="count++">count is {{ count }}</button>
-    <p>
-      Edit
-      <code>components/HelloWorld.vue</code> to test HMR
-    </p>
-  </div>
-
-  <p>
-    Check out
-    <a href="https://vuejs.org/guide/quick-start.html#local" target="_blank"
-      >create-vue</a
-    >, the official Vue + Vite starter
-  </p>
-  <p>
-    Install
-    <a href="https://github.com/vuejs/language-tools" target="_blank">Volar</a>
-    in your IDE for a better DX
-  </p>
-  <p class="read-the-docs">Click on the Vite and Vue logos to learn more</p>
-</template>
-
-<style scoped>
-.read-the-docs {
-  color: #888;
-}
-</style>