xpine 0.0.21 → 0.0.22

package/dist/src/util/require.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"require.d.ts","sourceRoot":"","sources":["../../../src/util/require.ts"],"names":[],"mappings":";AAEA,wBAA8C;AAE9C,wBAAgB,eAAe,WAI9B"}
+{"version":3,"file":"require.d.ts","sourceRoot":"","sources":["../../../src/util/require.ts"],"names":[],"mappings":";AAEA,wBAA8C;AAE9C,wBAAgB,eAAe,WAS9B"}

package/dist/types.d.ts

@@ -1,6 +1,6 @@
-import { Request } from 'express';
+import { Request, Response } from 'express';
 export type XPineConfig = {
-    [key: string]: string;
+    [key: string]: any;
 };
 export type TokenUser = {
     email?: string;
@@ -8,5 +8,34 @@ export type TokenUser = {
 };
 export type ServerRequest = Request & {
     user?: TokenUser;
+    clientIp?: string;
+};
+export type WrapperProps = {
+    req: ServerRequest;
+    children: any;
+    config: ConfigFile;
+    data?: any;
+};
+export type ConfigFile = {
+    staticPaths?: boolean | (() => Promise<{
+        [key: string]: string;
+    }[]>);
+    wrapper?: (props: WrapperProps) => Promise<any>;
+    data?: (req: ServerRequest) => Promise<any>;
+};
+export type PageProps = {
+    req: ServerRequest;
+    res: Response;
+    data: any;
+};
+export type FileItem = {
+    file: string;
+    size: number;
+};
+export type ComponentData = {
+    path: string;
+    contents: string;
+    clientContent: string;
+    configFiles: string[];
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,MAAM,MAAM,WAAW,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG;IACpC,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5C,MAAM,MAAM,WAAW,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG;IACpC,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,aAAa,CAAC;IACnB,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,WAAW,CAAC,EAAE,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,EAAE,CAAC,CAAC,CAAC;IACpE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAChD,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CAC7C,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,GAAG,EAAE,aAAa,CAAC;IACnB,GAAG,EAAE,QAAQ,CAAC;IACd,IAAI,EAAE,GAAG,CAAC;CACX,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAA"}

package/eslint.config.mjs

@@ -0,0 +1,27 @@
+import eslint from '@eslint/js';
+import tseslint from 'typescript-eslint';
+
+export default tseslint.config(
+  eslint.configs.recommended,
+  tseslint.configs.recommended,
+  {
+    rules: {
+      'eol-last': 2,
+      'quotes': ['error', 'single'],
+      'comma-dangle': ['error', {
+        'objects': 'always',
+        'arrays': 'never',
+        'imports': 'never',
+        'exports': 'never',
+        'functions': 'never',
+      }],
+      'semi': 'error',
+      '@typescript-eslint/ban-ts-comment': 'off',
+      '@typescript-eslint/no-require-imports': 'off',
+    },
+    files: ["src/**/*.{js,mjs,ts,tsx,jsx}"],
+  },
+  {
+    ignores: ["dist/", "cdk.out/", "tests/dist/", "tests/playwright-report/"]
+  }
+)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xpine",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "main": "dist/index.js",
   "dependencies": {
     "@aws-sdk/client-secrets-manager": "^3.758.0",
@@ -16,8 +16,10 @@
     "jsonwebtoken": "^9.0.2",
     "postcss": "^8.5.3",
     "request-ip": "^3.3.0",
+    "shelljs": "^0.9.2",
     "tsx": "^4.19.3",
-    "typescript": "^5.7.3"
+    "typescript": "^5.7.3",
+    "yargs": "^17.7.2"
   },
   "repository": {
     "type": "git",
@@ -26,7 +28,14 @@
   "scripts": {
     "build": "tsx ./src/scripts/run-build-module.ts && npm run build:types",
     "build:types": "sh ./src/scripts/build-types.sh",
-    "xpine-dev-server": "tsx ./src/scripts/xpine-dev-server.ts"
+    "xpine-dev-server": "tsx ./src/scripts/xpine-dev-server.ts",
+    "test": "cd ./tests && npm run test",
+    "test:dev": "cd ./tests && npm run dev",
+    "test:start": "cd ./tests && npm run build && npm start",
+    "test:build": "cd ./tests && npm run build",
+    "lint": "npx eslint",
+    "fix": "npx eslint --fix",
+    "publish": "npm run build && npm version patch && npm publish"
   },
   "bin": {
     "xpine-build": "dist/src/scripts/xpine-build.js",
@@ -35,8 +44,13 @@
   "types": "dist/index.d.ts",
   "type": "module",
   "devDependencies": {
+    "@eslint/js": "^9.24.0",
     "@types/express": "^5.0.0",
     "@types/node": "^22.13.5",
-    "@types/request-ip": "^0.0.41"
+    "@types/request-ip": "^0.0.41",
+    "@types/shelljs": "^0.8.15",
+    "@types/yargs": "^17.0.33",
+    "axios": "^1.8.4",
+    "typescript-eslint": "^8.29.0"
   }
 }

package/tests/e2e/alpine.spec.ts

@@ -0,0 +1,14 @@
+import { test, expect } from '@playwright/test';
+import { url } from '../playwright.config';
+
+test('pathD button changes color on button click', async ({ page }) => {
+  await page.goto(url + '/my-path-a2/my-path-b2/my-path-c2/2');
+  const button = page.getByTestId('path-d-button');
+  const initialStyle = await button.getAttribute('style');
+  expect(initialStyle).toEqual('background-color: red');
+  await test.step('click button', async () => {
+    await button.click();
+    const newStyle = await button.getAttribute('style');
+    expect(newStyle).toEqual('background-color: blue');
+  });
+});

package/tests/e2e/app-build.spec.ts

@@ -0,0 +1,73 @@
+import { test, expect } from '@playwright/test';
+import { config } from 'xpine';
+import fs from 'fs-extra';
+import path from 'path';
+import { url } from '../playwright.config';
+
+test('app builds', async ({ page }) => {
+  await page.goto(url);
+  await expect(page.getByTestId('hello-world')).toHaveText('Hello world');
+});
+
+test('home page uses same file wrapper', async ({ page }) => {
+  await page.goto(url);
+  await expect(page.getByTestId('home-page-wrapper')).toBeAttached();
+  expect(await page.getByTestId('base-config').count()).toEqual(0);
+  const title = await page.title();
+  expect(title).toEqual('Home page');
+});
+
+test('same dir +config uses config', async ({ page }) => {
+  await page.goto(url + '/with-same-dir-wrapper');
+  await expect(page.getByTestId('base-config')).toBeAttached();
+  const title = await page.title();
+  expect(title).toEqual('Default title');
+});
+
+test('dynamic paths with data in +config - path c', async ({ page }) => {
+  const result = await page.goto(url + '/my-path-a/my-path-b/1');
+  await expect(page.getByTestId('path-c-data')).toHaveText('sunt aut facere repellat provident occaecati excepturi optio reprehenderit');
+  await expect(page.getByTestId('path-c-patha')).toHaveText('my-path-a');
+  await expect(page.getByTestId('path-c-pathb')).toHaveText('my-path-b');
+  await expect(page.getByTestId('base-config')).toBeAttached();
+  const body = (await result.body()).toString();
+  expect(body).toContain('<!-- static -->');
+});
+
+test('dynamic inner paths with config in the component - path d', async ({ page }) => {
+  const result = await page.goto(url + '/my-path-a2/my-path-b2/my-path-c2/2');
+  await expect(page.getByTestId('path-d-data')).toHaveText('qui est esse');
+  await expect(page.getByTestId('path-d-patha')).toHaveText('my-path-a2');
+  await expect(page.getByTestId('path-d-pathb')).toHaveText('my-path-b2');
+  await expect(page.getByTestId('path-d-pathc')).toHaveText('my-path-c2');
+  await expect(page.getByTestId('base-config')).toBeAttached();
+  const body = (await result.body()).toString();
+  expect(body).toContain('<!-- static -->');
+});
+
+test('static paths exist for dynamic page', async () => {
+  expect(fs.existsSync(path.join(config.distDir, './pages/my-path-a2/my-path-b2/my-path-c2/2/index.html'))).toEqual(true);
+});
+
+test('boolean static path', async ({ page }) => {
+  const result = await page.goto(url + '/boolean-static-path');
+  const body = (await result.body()).toString();
+  expect(body).toContain('<!-- static -->');
+
+  expect(fs.existsSync(path.join(config.distDir, './pages/boolean-static-path/index.html'))).toEqual(true);
+});
+
+test('inner static path override', async ({ page }) => {
+  expect(fs.existsSync(path.join(config.distDir, './pages/base-static-path/index.html'))).toEqual(true);
+  expect(fs.existsSync(path.join(config.distDir, './pages/base-static-path/non-static-path/index.html'))).toEqual(false);
+
+  const staticResult = await page.goto(url + '/base-static-path');
+  await expect(page.getByTestId('base-static-path')).toHaveText('My title');
+  const staticBody = (await staticResult.body()).toString();
+  expect(staticBody).toContain('<!-- static -->');
+
+  const nonStaticResult = await page.goto(url + '/base-static-path/non-static-path');
+  await expect(page.getByTestId('non-static-path')).toHaveText('My title');
+  const nonStaticBody = (await nonStaticResult.body()).toString();
+  expect(nonStaticBody).not.toContain('<!-- static -->');
+});

package/tests/e2e/spa.spec.ts

@@ -0,0 +1,23 @@
+import { test, expect } from '@playwright/test';
+import { url } from '../playwright.config';
+
+
+test('sticky nav creates request for page contents and does not reload page', async ({ page }) => {
+  await page.goto(url);
+  const link = page.getByTestId('navbar-boolean-static-path');
+  const navbarNow = await page.getByTestId('navbar-now').getAttribute('data-now');
+  await link.click();
+  await page.waitForURL('**/boolean-static-path');
+  const newNavbarNow = await page.getByTestId('navbar-now').getAttribute('data-now');
+  expect(navbarNow).toEqual(newNavbarNow);
+});
+
+test('non-spa request for page contents reloads page', async ({ page }) => {
+  await page.goto(url);
+  const link = page.getByTestId('navbar-non-static-path-non-spa');
+  const navbarNow = await page.getByTestId('navbar-now').getAttribute('data-now');
+  await link.click();
+  await page.waitForURL('**/base-static-path/non-static-path');
+  const newNavbarNow = await page.getByTestId('navbar-now').getAttribute('data-now');
+  expect(navbarNow).not.toEqual(newNavbarNow);
+});