oc-template-solid-compiler 0.6.1 → 0.6.3

package/dist/lib/compile.d.ts

@@ -1,3 +1 @@
-import { createCompile } from 'oc-generic-template-compiler';
-export type CompilerOptions = ReturnType<typeof createCompile>;
-export declare const compile: CompilerOptions;
+export declare const compile: (options: import("oc-generic-template-compiler").CompilerOptions, callback: (err: Error | null, data: unknown) => void) => void;

package/dist/lib/compile.js

@@ -4,20 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compile = void 0;
-const oc_generic_template_compiler_1 = require("oc-generic-template-compiler");
-const oc_statics_compiler_1 = __importDefault(require("oc-statics-compiler"));
 const oc_template_solid_1 = require("oc-template-solid");
-const oc_vite_compiler_1 = require("oc-vite-compiler");
 const vite_plugin_solid_1 = __importDefault(require("vite-plugin-solid"));
+const oc_vite_compiler_1 = require("oc-vite-compiler");
 const solidOCProviderTemplate_1 = __importDefault(require("./solidOCProviderTemplate"));
-exports.compile = (0, oc_generic_template_compiler_1.createCompile)({
-    compileView: (options, cb) => (0, oc_vite_compiler_1.viteView)({
-        ...options,
-        plugins: [(0, vite_plugin_solid_1.default)()],
-        viewWrapper: solidOCProviderTemplate_1.default,
-        externals: (0, oc_template_solid_1.getInfo)().externals
-    }, cb),
-    compileServer: oc_vite_compiler_1.viteServer,
-    compileStatics: oc_statics_compiler_1.default,
+exports.compile = (0, oc_vite_compiler_1.createCompile)({
+    plugins: [(0, vite_plugin_solid_1.default)()],
+    viewWrapper: solidOCProviderTemplate_1.default,
     getInfo: oc_template_solid_1.getInfo
 });

package/dist/lib/solidOCProviderTemplate.d.ts

@@ -1,3 +1,4 @@
-export default function solidOCProviderTemplate({ viewPath }: {
+export default function solidOCProviderTemplate({ viewPath, providerFunctions }: {
     viewPath: string;
+    providerFunctions: string;
 }): string;

package/dist/lib/solidOCProviderTemplate.js

@@ -1,44 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const removeExtension = (path) => path.replace(/\.(t|j)sx?$/, '');
-function solidOCProviderTemplate({ viewPath }) {
+function solidOCProviderTemplate({ viewPath, providerFunctions }) {
     return `
   import { render } from 'solid-js/web';
   import View from '${removeExtension(viewPath)}';
   import { DataProvider } from 'oc-template-solid-compiler/dist/utils/useData'
 
-  function OCProvider(props: any): any {
+  function OCProvider(props) {
     const { _staticPath, _baseUrl, _componentName, _componentVersion, ...rest } = props;
 
-    (window as any).oc.events.fire('oc:componentDidMount', rest);
+    ${providerFunctions}
 
-    function getData(providerProps: any, parameters: any, cb: (error: any, parameters?: any, props?: any) => void) {
-      return (window as any).oc.getData({
-        name: providerProps._componentName,
-        version: providerProps._componentVersion,
-        baseUrl: providerProps._baseUrl,
-        parameters
-      }, (err: any, data: any) => {
-        if (err) {
-          return cb(err);
-        }
-        const { _staticPath, _baseUrl, _componentName, _componentVersion, ...rest } = (data.component.props as any); 
-        cb(null, rest, data.component.props);
-      });
-    }
-
-    function getSetting(providerProps: any, setting: string) {
-      const settingHash = {
-        name: providerProps._componentName,
-        version: providerProps._componentVersion,
-        baseUrl: providerProps._baseUrl,
-        staticPath: providerProps._staticPath
-      };
-      return (settingHash as any)[setting];
-    }
-   
-    (rest as any).getData = (parameters: any, cb: (error: any, parameters?: any, props?: any) => void) => getData(props, parameters, cb);
-    (rest as any).getSetting = (setting: string) => getSetting(props, setting);
+    window.oc.events.fire('oc:componentDidMount', rest);
+    rest.getData = getData;
+    rest.getSetting = getSetting;
 
     return (
       <DataProvider value={{...rest}}>
@@ -47,11 +23,9 @@ function solidOCProviderTemplate({ viewPath }) {
     );
   }
 
-  function renderer(props, element) {
+  export default function renderer(props, element, ssr) {
     render(() => <OCProvider {...props} />, element);
   }
-
-  export default renderer;
 `;
 }
 exports.default = solidOCProviderTemplate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-template-solid-compiler",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Compiler for the SolidJS OC template",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,13 +29,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "chalk": "^3.0.0",
-    "immer": "^9.0.6",
-    "oc-generic-template-compiler": "2.1.1",
-    "oc-statics-compiler": "2.1.1",
     "oc-template-solid": "^0.1.0",
-    "oc-vite-compiler": "^3.1.1",
-    "resolve": "^1.20.0",
+    "oc-vite-compiler": "^3.3.0",
     "solid-js": "^1.8.7",
     "vite-plugin-solid": "^2.8.0"
   },
@@ -44,7 +39,6 @@
     "scaffold"
   ],
   "devDependencies": {
-    "lodash": "^4.17.4",
     "prettier": "^2.3.2",
     "prettier-config-guestline": "2.0.0"
   }

package/scaffold/src/package.json

@@ -34,7 +34,7 @@
     "@types/testing-library__jest-dom": "^5.14.5",
     "jsdom": "^21.1.1",
     "oc-server": "*",
-    "oc-template-solid-compiler": "0.4.0",
+    "oc-template-solid-compiler": "*",
     "solid-js": "^1.8.7",
     "typescript": "5.0.2",
     "vitest": "^0.29.7"