oc-server 2.1.0 → 2.1.2

package/dist/cli/oc.d.ts

@@ -1,13 +1,14 @@
 import { FastifyRequest } from 'fastify';
 import { PluginMock } from './get-mocked-plugins';
+interface Parameters {
+    mandatory: boolean;
+    example: string | number | boolean;
+}
 interface Package {
     name: string;
     version: string;
     oc?: {
-        parameters?: Record<string, {
-            mandatory: boolean;
-            example: string | number | boolean;
-        }>;
+        parameters?: Record<string, Parameters>;
         files: {
             data?: string;
             template?: {
@@ -17,10 +18,10 @@ interface Package {
         };
     };
 }
+export declare function getDefaultParams(parameters: Record<string, Parameters>): {};
 export declare function parsePkg(pkg: Package): {
     name: string;
     version: string;
-    defaultParams: {};
     serverEntry: string | undefined;
     appEntry: string;
     templateType: string;

package/dist/cli/oc.js

@@ -1,20 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefaultParams = getDefaultParams;
 exports.parsePkg = parsePkg;
 exports.getContext = getContext;
-function parsePkg(pkg) {
-    const serverEntry = pkg.oc?.files?.data;
-    let appEntry = pkg.oc?.files?.template?.src || '';
-    if (!appEntry) {
-        throw new Error('Missing an entry on your package.json under oc.files.template.src');
-    }
-    if (!appEntry.startsWith('/')) {
-        appEntry = `/${appEntry}`;
-    }
+function getDefaultParams(parameters) {
     const defaultParams = (() => {
         let params = {};
-        if (pkg.oc?.parameters) {
-            params = Object.fromEntries(Object.entries(pkg.oc.parameters || {})
+        if (parameters) {
+            params = Object.fromEntries(Object.entries(parameters || {})
                 .filter(([, param]) => {
                 return !!param.mandatory && 'example' in param;
             })
@@ -22,6 +15,17 @@ function parsePkg(pkg) {
         }
         return params;
     })();
+    return defaultParams;
+}
+function parsePkg(pkg) {
+    const serverEntry = pkg.oc?.files?.data;
+    let appEntry = pkg.oc?.files?.template?.src || '';
+    if (!appEntry) {
+        throw new Error('Missing an entry on your package.json under oc.files.template.src');
+    }
+    if (!appEntry.startsWith('/')) {
+        appEntry = `/${appEntry}`;
+    }
     const templateType = pkg.oc?.files?.template?.type;
     if (!templateType) {
         throw new Error('Missing an entry on your package.json under oc.files.template.type');
@@ -29,7 +33,6 @@ function parsePkg(pkg) {
     return {
         name: pkg.name,
         version: pkg.version,
-        defaultParams,
         serverEntry,
         appEntry,
         templateType,

package/dist/cli/server.js

@@ -17,10 +17,14 @@ const oc_1 = require("./oc");
 const get_mocked_plugins_1 = __importDefault(require("./get-mocked-plugins"));
 const promisify = (fn) => (...args) => new Promise((resolve, reject) => fn(...args, (err, data) => (err ? reject(err) : resolve(data))));
 const pk = require(node_path_1.default.join(process.cwd(), 'package.json'));
-const { name, version, appEntry, serverEntry, defaultParams } = (0, oc_1.parsePkg)(pk);
+const { name, version, appEntry, serverEntry } = (0, oc_1.parsePkg)(pk);
 function getDataProvider() {
     if (!serverEntry) {
-        return async (context) => ({ ...(context.params ?? {}) });
+        return {
+            dataProvider: async (context) => ({
+                ...(context.params ?? {}),
+            }),
+        };
     }
     const result = esbuild_1.default.buildSync({
         entryPoints: [serverEntry],
@@ -32,10 +36,14 @@ function getDataProvider() {
     const backend = node_vm_1.default.runInNewContext(code, {
         ...globalThis,
         exports: {},
+        console,
         module: { exports: {} },
     });
     const dataProvider = backend.data || backend.server.getData();
-    return promisify(dataProvider);
+    return {
+        dataProvider: promisify(dataProvider),
+        parametersSchema: backend.server?._parameters,
+    };
 }
 function getBaseTemplate(appBlock) {
     const baseTemplate = `
@@ -50,7 +58,7 @@ function getBaseTemplate(appBlock) {
       width: 100%;
       height: 100%;
       margin: 0;
-    };
+    }
     </style>
   </head>
   <body>
@@ -90,11 +98,12 @@ async function createServer({ template, port, }) {
     const { dev: clientJs } = oc_client_browser_1.default.compileSync();
     const app = (0, fastify_1.default)({ logger: false });
     await app.register(express_1.default);
-    const dataProvider = getDataProvider();
+    const { dataProvider, parametersSchema } = getDataProvider();
     const plugins = (0, get_mocked_plugins_1.default)(node_path_1.default.join(process.cwd(), '..'));
     for (const plugin of plugins) {
         plugin.register.register(null, null, () => { });
     }
+    const defaultParams = (0, oc_1.getDefaultParams)(pk.oc?.parameters ?? parametersSchema);
     const vite = await (0, vite_1.createServer)({
         server: { middlewareMode: true },
         plugins: [(0, cssModulesPlugin_1.default)(), template.plugin?.()].filter(Boolean),

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "oc-server",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": "dist/cli/index.js",
+  "scripts": {
+    "build": "tsc",
+    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
+  },
   "keywords": [
     "oc",
     "opencomponents"
@@ -21,9 +25,5 @@
     "@fastify/express": "^3.0.0",
     "fastify": "^4.28.1",
     "oc-client-browser": "^1.8.0"
-  },
-  "scripts": {
-    "build": "tsc",
-    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
   }
 }