jinrai 1.1.4 → 1.1.6

package/index.ts

@@ -1,3 +1,7 @@
+export { JinraiContext } from "./src/front/url/JinraiContext"
+
+export { JinraiDebug } from "./src/front/url/JinraiDebug"
+
 export type { ServerKey } from "./src/front/server-state/useServerState"
 
 export { useServerState } from "./src/front/server-state/useServerState"

package/lib/bin/bin.js

@@ -9,7 +9,7 @@ import ora, { spinners } from 'ora';
 import { stdout, stdin } from 'node:process';
 import readline from 'node:readline/promises';
 import path from 'node:path';
-import { preview } from 'vite';
+import { createServer } from 'vite';
 
 const getUserConfig = async (configName) => {
     const jiti = createJiti(import.meta.url, {
@@ -271,7 +271,7 @@ const getRawPageData = async (url, pages, test = false, debug = false) => {
         const path = mask.replaceAll("{", "").replaceAll("}", "").replace("\/*", "");
         await page.goto(url + path);
         await page.waitForLoadState("networkidle");
-        await page.waitForTimeout(1000);
+        await page.waitForTimeout(2000);
         const { state, root, lang } = await pageCollector(page);
         if (defaultLang == undefined) {
             defaultLang = lang;
@@ -304,11 +304,17 @@ const getRawPageData = async (url, pages, test = false, debug = false) => {
 };
 
 const vitePreview = async () => {
-    const previewServer = await preview({
-        preview: {
-            port: 8084,
-        },
+    // const previewServer = await preview({
+    //     preview: {
+    //         port: 8084,
+    //     },
+    // })
+    const previewServer = await createServer({
+        server: {
+            port: 8084
+        }
     });
+    await previewServer.listen();
     if (!previewServer.resolvedUrls?.local?.length)
         throw new Error("vite is not defined");
     return [previewServer.resolvedUrls?.local[0].slice(0, -1), () => previewServer.close()];
@@ -322,7 +328,7 @@ const runBuild = async (options) => {
     task.success();
     const [serverUrl, close] = await vitePreview();
     const { pages, lang } = await getRawPageData(serverUrl, config.pages, config.test, options.debug);
-    console.log({ lang });
+    // console.log({ lang })
     close();
     const outputcashe = path.join(config.dist ?? "dist", ".cached");
     task.do("Format");
@@ -330,7 +336,7 @@ const runBuild = async (options) => {
     task.next(`Export: (${templates.length})`);
     await mkdir(outputcashe, { recursive: true });
     console.log("dev");
-    const exportConfig = { routes, proxy: config.proxy, meta: config.meta, lang };
+    const exportConfig = { routes, proxy: config.proxy, meta: config.meta, lang, cacheablePaths: config.cacheablePaths };
     await writeFile(path.join(outputcashe, "config.json"), JSON.stringify(exportConfig, null, 2));
     // await writeFile(
     //     path.join(outputcashe, "index.html"),

package/lib/index.d.ts

@@ -1,3 +1,5 @@
+export { JinraiContext } from "./src/front/url/JinraiContext";
+export { JinraiDebug } from "./src/front/url/JinraiDebug";
 export type { ServerKey } from "./src/front/server-state/useServerState";
 export { useServerState } from "./src/front/server-state/useServerState";
 export { orig, original } from "./src/front/server-state/orig";

package/lib/index.js

@@ -1,3 +1,5 @@
+export { JinraiContext } from './src/front/url/JinraiContext.js';
+export { JinraiDebug } from './src/front/url/JinraiDebug.js';
 export { useServerState } from './src/front/server-state/useServerState.js';
 export { orig, original } from './src/front/server-state/orig.js';
 export { useParamsIndex } from './src/front/url/params/useParamsIndex.js';

package/lib/src/bin/config/userConfig.d.ts

@@ -10,5 +10,6 @@ export interface Config {
     dist?: string;
     proxy?: Record<string, string>;
     meta?: string;
+    cacheablePaths?: string[];
 }
 export declare const getUserConfig: (configName: string) => Promise<Config>;

package/lib/src/front/server-state/DataProxy.js

@@ -19,8 +19,10 @@ const getTarget = (data, path) => {
     }
 };
 function createDataProxy(data, path = "") {
-    if (path.endsWith("@"))
+    if (path.endsWith("@")) {
+        console.log("set to source >>>> ", path);
         sources.set(path.slice(0, -1), data);
+    }
     return new Proxy(getTarget(data, path), {
         get: (_target, prop) => {
             if (ssr.exportToJV) {

package/lib/src/front/server-state/orig.js

@@ -37,6 +37,9 @@ const getArrayByPath = (path) => {
     const keys = requestPath.split("/");
     keys.shift();
     let link = sources.get(sourceIndex);
+    if (!link) {
+        return link;
+    }
     for (let key of keys) {
         if (key.startsWith("[ITEM="))
             key = key.slice(6, -1);

package/lib/src/front/server-state/serverStates.js

@@ -21,17 +21,18 @@ const getIdent = (key) => {
     return Array.isArray(key) ? key.join("-") : key;
 };
 const getServerValue = (key, def, options) => {
+    console.log("KKKey", key);
     if (key == undefined) {
         return [def, false];
     }
     const ident = getIdent(key);
     serverStates.set(ident, { options, value: !options?.source ? def : undefined, key });
-    console.log("CHECK", ident);
+    // console.log("CHECK", ident)
     if (ident in initialState) {
         const result = initialState[ident];
         // delete initialState[ident]
-        console.log("HAS", ident, result);
-        if (result != null && typeof result == 'object' && "data" in result) {
+        // console.log("HAS", ident, result)
+        if (result != null && typeof result == "object" && "data" in result) {
             return [result.data, true];
         }
         return [result, true];
@@ -39,6 +40,7 @@ const getServerValue = (key, def, options) => {
     return [def, false];
 };
 const setServerValue = (key, value, options) => {
+    console.log("KKK>>", key);
     const ident = getIdent(key);
     serverStates.set(ident, { options, value: !options?.source ? value : undefined, key });
     return createDataProxy(value, `${ident}@`);

package/lib/src/front/url/JinraiContext.d.ts

@@ -2,6 +2,7 @@ import { DependencyList, ReactNode } from "react";
 export interface JinraiProps {
     deps?: DependencyList;
     children?: ReactNode;
-    search: string;
+    search?: string;
+    debug?: string;
 }
 export declare const JinraiContext: import("react").Context<JinraiProps>;

package/lib/src/front/url/JinraiContext.js

@@ -3,7 +3,6 @@ import { createContext } from 'react';
 const JinraiContext = createContext({
     deps: [],
     children: undefined,
-    search: ""
 });
 
 export { JinraiContext };

package/lib/src/front/url/JinraiDebug.d.ts

@@ -0,0 +1,6 @@
+import { ReactNode } from "react";
+interface props {
+    children: ReactNode;
+}
+export declare const JinraiDebug: (props: props) => ReactNode;
+export {};

package/lib/src/front/url/JinraiDebug.js

@@ -0,0 +1,8 @@
+import { ssr } from '../server-state/SSR.js';
+
+const JinraiDebug = (props) => {
+    ssr.current = true;
+    return props.children;
+};
+
+export { JinraiDebug };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jinrai",
-    "version": "1.1.4",
+    "version": "1.1.6",
     "description": "A powerful library that analyzes your modern web application and automatically generates a perfectly rendered, static snapshot of its pages. Experience unparalleled loading speed and SEO clarity without the complexity of traditional SSR setups. Simply point Jinrai at your SPA and witness divine speed.",
     "main": "lib/index.ts",
     "scripts": {
@@ -64,7 +64,7 @@
             "import": "./lib/src/front/url/adapter/rrd7.js"
         },
         "./config": {
-            "types": "./lib/config/config.d.ts",
+            "types": "./lib/config.d.ts",
             "import": "./lib/config/config.js"
         },
         "./vite": {

package/src/bin/bin.ts

@@ -2,6 +2,7 @@ import { runBuild } from "./build/build"
 
 const args = process.argv.slice(2)
 
+
 const debug = args.includes("--debug")
 const customConfig = args.find(itm => itm.startsWith("--config="))?.substring(9)
 

package/src/bin/build/build.ts

@@ -30,7 +30,7 @@ export const runBuild = async (options: buildArgs) => {
 
     const { pages, lang } = await getRawPageData(serverUrl, config.pages, config.test, options.debug)
 
-    console.log({ lang })
+    // console.log({ lang })
 
     close()
 
@@ -44,7 +44,7 @@ export const runBuild = async (options: buildArgs) => {
 
     console.log("dev")
 
-    const exportConfig = { routes, proxy: config.proxy, meta: config.meta, lang }
+    const exportConfig = { routes, proxy: config.proxy, meta: config.meta, lang, cacheablePaths: config.cacheablePaths }
 
     await writeFile(path.join(outputcashe, "config.json"), JSON.stringify(exportConfig, null, 2))
     // await writeFile(

package/src/bin/config/define.ts

@@ -1,7 +1,5 @@
 import type { Config } from "./userConfig"
 
-export const defineConfig = (config: Config) => {
+export const defineConfig = (config: Config): Config => {
     return config
 }
-
-

package/src/bin/config/userConfig.ts

@@ -15,6 +15,7 @@ export interface Config {
     dist?: string
     proxy?: Record<string, string>
     meta?: string
+    cacheablePaths?: string[]
 }
 
 export const getUserConfig = async (configName: string): Promise<Config> => {

package/src/bin/playwright/templates.ts

@@ -49,7 +49,7 @@ export const getRawPageData = async (
 
         await page.waitForLoadState("networkidle")
 
-        await page.waitForTimeout(1000)
+        await page.waitForTimeout(2000)
 
         const { state, root, lang } = await pageCollector(page)
         if (defaultLang == undefined) {

package/src/bin/server/vitePreview.ts

@@ -1,12 +1,21 @@
-import { preview } from "vite"
+import { createServer, preview } from "vite"
 
 export const vitePreview = async () => {
-    const previewServer = await preview({
-        preview: {
-            port: 8084,
-        },
+    // const previewServer = await preview({
+    //     preview: {
+    //         port: 8084,
+    //     },
+    // })
+
+    const previewServer = await createServer({
+        server: {
+            port: 8084
+        }
     })
 
+    await previewServer.listen()
+
+
     if (!previewServer.resolvedUrls?.local?.length) throw new Error("vite is not defined")
 
     return [previewServer.resolvedUrls?.local[0].slice(0, -1), () => previewServer.close()] as [string, () => void]

package/src/front/server-state/DataProxy.ts

@@ -31,8 +31,10 @@ const getTarget = (data: any, path: string) => {
 
 type WithDataProxy<T> = T & DataProxy
 function createDataProxy<T>(data: T, path: string = ""): WithDataProxy<T> {
-    if (path.endsWith("@")) sources.set(path.slice(0, -1), data)
-
+    if (path.endsWith("@")) {
+        console.log("set to source >>>> ", path)
+        sources.set(path.slice(0, -1), data)
+    }
     return new Proxy(getTarget(data, path), {
         get: (_target: any, prop: PropertyKey) => {
             if (ssr.exportToJV) {

package/src/front/server-state/orig.ts

@@ -47,6 +47,9 @@ const getArrayByPath = (path: string) => {
     const requestId = keys.shift()
 
     let link = sources.get(sourceIndex)
+    if (!link) {
+        return link
+    }
 
     for (let key of keys) {
         if (key.startsWith("[ITEM=")) key = key.slice(6, -1)

package/src/front/server-state/serverStates.ts

@@ -45,21 +45,22 @@ export const getIdent = (key: ServerKey): string => {
 }
 
 export const getServerValue = (key?: ServerKey, def?: ServerValue["value"], options?: ServerValue["options"]) => {
+    // console.log("KKKey", key)
     if (key == undefined) {
         return [def, false]
     }
     const ident = getIdent(key)
     serverStates.set(ident, { options, value: !options?.source ? def : undefined, key })
 
-    console.log("CHECK", ident)
+    // console.log("CHECK", ident)
 
     if (ident in initialState) {
         const result = initialState[ident]
         // delete initialState[ident]
 
-        console.log("HAS", ident, result)
+        // console.log("HAS", ident, result)
 
-        if (result != null && typeof result == 'object' && "data" in result) {
+        if (result != null && typeof result == "object" && "data" in result) {
             return [result.data, true]
         }
 
@@ -70,6 +71,7 @@ export const getServerValue = (key?: ServerKey, def?: ServerValue["value"], opti
 }
 
 export const setServerValue = (key: ServerKey, value: ServerValue["value"], options?: ServerValue["options"]) => {
+    // console.log("KKK>>", key)
     const ident = getIdent(key)
     serverStates.set(ident, { options, value: !options?.source ? value : undefined, key })
     return createDataProxy(value, `${ident}@`)

package/src/front/url/JinraiContext.tsx

@@ -3,10 +3,10 @@ import { createContext, DependencyList, ReactNode } from "react"
 export interface JinraiProps {
     deps?: DependencyList
     children?: ReactNode
-    search: string
+    search?: string
+    debug?: string
 }
 export const JinraiContext = createContext<JinraiProps>({
     deps: [],
     children: undefined,
-    search: ""
 })

package/src/front/url/JinraiDebug.tsx

@@ -0,0 +1,12 @@
+import { ReactNode } from "react"
+import { ssr } from "../server-state/SSR"
+
+interface props {
+    children: ReactNode,
+}
+
+export const JinraiDebug = (props: props) => {
+    ssr.current = true
+
+    return props.children
+}

package/tests/parse/custom.test.ts

@@ -9,7 +9,8 @@ describe("test custom component", async () => {
 
     it("parse custom.html", async () => {
         const html = await readFile("./tests/parse/content/custom.html", "utf-8")
-        // expect(JSON.stringify(parsr.parse(html))).toEqual("")
+        const result = parsr.parse(html)
+        // expect(JSON.stringify(result)).toEqual("")
 
         expect(parsr.parse(html)).toEqual(custom)
     })