create-oc 0.0.8 → 0.0.11

package/package.json

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

package/templates/elm/package.json

@@ -23,9 +23,9 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "oc-server": "*",
-    "oc-template-elm-compiler": "*",
-    "elm": "*",
-    "typescript": "*"
+    "oc-server": "^0.3.0",
+    "oc-template-elm-compiler": "^0.3.0",
+    "elm": "^0.19.1-6",
+    "typescript": "^5.3.3"
   }
 }

package/templates/es6/.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["Tobermory.es6-string-html"]
+}

package/templates/es6/package.json

@@ -4,28 +4,27 @@
   "version": "1.0.0",
   "oc": {
     "files": {
-      "data": "server.js",
+      "data": "src/server.ts",
       "static": [
-        "img",
-        "css"
+        "public"
       ],
       "template": {
-        "src": "view.js",
+        "src": "src/view.ts",
         "type": "oc-template-es6"
       }
     },
     "parameters": {
-      "name": {
-        "default": "Jane Doe",
-        "description": "Your name",
-        "example": "Jane Doe",
-        "mandatory": false,
-        "type": "string"
+      "userId": {
+        "default": 1,
+        "description": "The user id from the user database",
+        "example": 1,
+        "mandatory": true,
+        "type": "number"
       }
     }
   },
   "devDependencies": {
-    "oc-server": "*",
-    "oc-template-es6-compiler": "*"
+    "oc-server": "^0.3.0",
+    "oc-template-es6-compiler": "^4.0.3"
   }
 }

package/templates/es6/src/server.ts

@@ -0,0 +1,50 @@
+import { Server } from 'oc-server';
+
+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 userDatabase[userId];
+}
+
+async function getFunFact(year: number) {
+  return yearsFunFactDatabase[year];
+}
+
+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 {
+    firstName,
+    lastName,
+    born: user.born,
+    hobbies: user.hobbies,
+  };
+}).action('funFact', async (params: { year: number }) => {
+  const { year } = params;
+  const funFact = await getFunFact(year);
+
+  return {
+    funFact,
+  };
+});
+
+declare module 'oc-server' {
+  interface Register {
+    server: typeof server;
+  }
+}

package/templates/es6/src/styles.css

@@ -0,0 +1,30 @@
+.container {
+  background-color: #3b246c;
+  color: #fff;
+  font-family: sans-serif;
+  padding: 40px;
+}
+
+.button {
+  background-color: #a97613;
+  border: none;
+  padding: 15px 32px;
+  text-align: center;
+  font-size: 16px;
+  text-decoration: none;
+  display: inline-block;
+  color: inherit;
+  cursor: pointer;
+}
+
+.info {
+  margin-bottom: 20px;
+}
+
+.block {
+  margin: 6px 0;
+}
+
+.button:hover {
+  background-color: #c79535;
+}

package/templates/es6/src/view.ts

@@ -0,0 +1,33 @@
+import { InitialData, serverClient } from 'oc-server';
+import styles from './styles.css';
+import logo from '../public/logo.png';
+
+declare const window: Window & {
+  getFunFact: () => Promise<void>;
+};
+
+export default ({ firstName, lastName, hobbies, born }: InitialData) => {
+  window.getFunFact = async () => {
+    const { funFact } = await serverClient.funFact({ year: born });
+    document.querySelector('#funfact')!.innerHTML = funFact;
+  };
+
+  return /* html */ `
+    <div class="${styles.container}">
+      <img width="50" height="50" src="${logo}" alt="Logo" />
+      <h1 style="margin: 0 0 20px 0;">
+        Hello, <span style="text-decoration: underline;">${firstName}</span> ${lastName}
+      </h1>
+      <div class=${styles.info}>
+        <div class=${styles.block}>Born: ${born}</div>
+        <div class=${styles.block}>
+          <div>Hobbies: ${hobbies.map((x) => x.toLowerCase()).join(', ')}</div>
+        </div>
+      </div>
+      <div id="funfact"></div>
+      <button class=${styles.button} onclick="getFunFact()">
+        Fun year fact
+      </button>
+    </div>
+  `;
+};

package/templates/preact/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "base-component-react",
+  "name": "base-component-preact",
   "description": "",
   "version": "1.0.0",
   "scripts": {
@@ -33,8 +33,8 @@
     "@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.0",
     "preact": "^10.13.2",
     "typescript": "5.0.2",
     "vitest": "^0.29.7"

package/templates/preact/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/templates/preact/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/templates/preact/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"]

package/templates/react/package.json

@@ -34,8 +34,8 @@
     "@testing-library/user-event": "^14.4.3",
     "@types/react": "^18.0.28",
     "jsdom": "^21.1.1",
-    "oc-server": "*",
-    "oc-template-react-compiler": "6.0.0",
+    "oc-server": "^0.3.0",
+    "oc-template-react-compiler": "^6.1.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<'funFact'>;
 
-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 () => {
+  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));
@@ -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>
-      )}
-      <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/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('funFact', async (params: { year: number }) => {
+  const { year } = params;
+  const funFact = await getFunFact(year);
 
   return {
-    age: user.age,
-    hobbies: user.hobbies
+    funFact,
   };
 });
 

package/templates/solid/package.json

@@ -33,8 +33,8 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@types/testing-library__jest-dom": "^5.14.5",
     "jsdom": "^21.1.1",
-    "oc-server": "*",
-    "oc-template-solid-compiler": "*",
+    "oc-server": "^0.3.0",
+    "oc-template-solid-compiler": "^0.7.0",
     "solid-js": "^1.8.7",
     "typescript": "5.0.2",
     "vitest": "^0.29.7"

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": {
@@ -33,8 +33,8 @@
     "@types/testing-library__jest-dom": "^5.14.5",
     "@vitejs/plugin-vue": "^5.0.0",
     "jsdom": "^21.1.1",
-    "oc-server": "*",
-    "oc-template-vue-compiler": "*",
+    "oc-server": "^0.3.0",
+    "oc-template-vue-compiler": "^0.2.0",
     "typescript": "5.0.2",
     "vitest": "^0.29.7",
     "vue": "^3.3.11",

package/templates/es6/css/styles.css

@@ -1,3 +0,0 @@
-.awesome {
-  background: palevioletred;
-}

package/templates/es6/server.ts

@@ -1,11 +0,0 @@
-import { Server } from "oc-server";
-
-export const server = new Server((params: { name: string }, context) => {
-  const { name } = params;
-  const { staticPath } = context;
-
-  return {
-    name,
-    staticPath,
-  };
-});

package/templates/es6/view.ts

@@ -1,10 +0,0 @@
-import logo from "./img/logo.png";
-import styles from "./css/styles.css";
-
-export default (props: { name: string }) => {
-  console.log("PR::", props);
-  return `<div class=${styles.awesome}>
-    Hello ${props.name}!
-    <img src="${logo}" />
-  </div>`;
-};

package/templates/preact/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/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;
-}