create-jwn-js 1.0.21 → 1.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-jwn-js",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "license": "PRIVATE",
   "author": "Webigorkiev",
   "bin": {
@@ -22,5 +22,19 @@
     "margv": "^1.1.2",
     "prompts": "^2.4.2"
   },
-  "devDependencies": {}
+  "devDependencies": {
+    "@jwn-js/common": "^2.1.15",
+    "@types/memjs": "^1.3.3",
+    "@types/node": "18",
+    "buildmsql": "^1.6.9",
+    "chalk": "4",
+    "cross-fetch": "3",
+    "easy-ash": "^1.1.14",
+    "jsdom": "^24.0.0",
+    "memjs": "^1.3.2",
+    "typescript": "^5.3.3",
+    "vite": "4",
+    "vitepress": "0.22.4",
+    "vitest": "^1.2.2"
+  }
 }

package/template-vite-node-ts/connect-template.json

@@ -4,13 +4,22 @@
             "mode": "development",
             "https": false,
             "port": 3000,
-            "host": "localhost"
+            "host": "localhost",
+            "url": "http://127.0.0.1"
         },
         "production": {
             "mode": "production",
+            "https": false,
             "port": 3000,
             "host": "127.0.0.1",
             "url": "http://127.0.0.1"
+        },
+        "test": {
+            "mode": "development",
+            "https": false,
+            "port": 3000,
+            "host": "localhost",
+            "url": "http://127.0.0.1"
         }
     },
     "db": {

package/template-vite-node-ts/package.json

@@ -7,27 +7,30 @@
   "main": "./index.ts",
   "scripts": {
     "dev": "vite",
+    "serve": "vite",
     "build": "vite build",
     "test": "vitest run",
+    "test:production": "vitest run -c vitest.config.production.ts",
     "docs:dev": "vitepress dev docs",
     "docs:build": "vitepress build docs",
     "docs:serve": "vitepress serve docs"
   },
   "devDependencies": {
-    "@types/memjs": "^1.3.0",
-    "@types/node": "^20.2.5",
-    "typescript": "^5.1.3",
-    "vite": "^4.3.9",
-    "vitepress": "^1.0.0-beta.1",
-    "vitest": "^0.32.0"
+    "@types/memjs": "^1.2.4",
+    "@types/node": "18",
+    "typescript": "^5.3.3",
+    "vite": "4",
+    "vitest": "^1.2.2",
+    "vitepress": "0.22.4",
+    "jsdom": "^24.0.0",
+    "chalk": "4"
   },
   "dependencies": {
-    "@jwn-js/common": "^2.0.7",
-    "buildmsql": "^1.3.2",
-    "cross-fetch": "^3.1.4",
-    "easy-ash": "^1.1.5",
-    "margv": "^1.1.2",
-    "mariadb": "^3.1.2",
-    "memjs": "^1.3.0"
+    "@jwn-js/common": "2.1.15",
+    "buildmsql": "1.6.9",
+    "cross-fetch": "3",
+    "easy-ash": "1.1.14",
+    "margv": "1.1.2",
+    "memjs": "1.3.2"
   }
 }

package/template-vite-node-ts/src/backend/server/helpers/createConfigServer.ts

@@ -5,8 +5,9 @@ const args = margv();
  * Config for server
  * @param config
  */
-export const createConfigServer = (config: Record<string, any>) => {
-    const configServer = process.env.NODE_ENV === "production" ? config.server.production : config.server.development;
+export const createConfigServer = (config: Record<string, any>, nodeEnv?: "development"|"production"|"test") => {
+    const env = (nodeEnv || process.env.NODE_ENV || "development") as "development"|"production"|"test";
+    const configServer = config.server[env];
 
     configServer.https =  args.https ?? configServer.https;
     configServer.protocol =  configServer.https ? "https" : "http";

package/template-vite-node-ts/src/scripts/test.config.ts

@@ -1,8 +1,14 @@
 import crossFetch from "cross-fetch";
+// @ts-ignore
 import config from "../../connect.json";
+<<<<<<< HEAD:template-vite-node-ts/src/scripts/test.setup.ts
+import {createConfigServer} from "../../src/backend/server/helpers/createConfigServer";
+const cnf = createConfigServer(config, process.env.TEST_MODE_APP as "test");
+=======
 import {createConfigServer} from "@/backend/server/helpers/createConfigServer";
 const cnf = createConfigServer(config);
 
+>>>>>>> ad324504e6d98d4d9229b45f1d428d8a9ce37811:template-vite-node-ts/src/scripts/test.config.ts
 const apiUrl = `${cnf.protocol}://${cnf.host}:${cnf.port}`;
 const defaultHeaders = {
     headers: {

package/template-vite-node-ts/src/scripts/test.setup.ts

@@ -0,0 +1,24 @@
+import crossFetch from "cross-fetch";
+// @ts-ignore
+import config from "../../connect.json";
+<<<<<<< HEAD:template-vite-node-ts/src/scripts/test.setup.ts
+import {createConfigServer} from "../../src/backend/server/helpers/createConfigServer";
+const cnf = createConfigServer(config, process.env.TEST_MODE_APP as "test");
+=======
+import {createConfigServer} from "@/backend/server/helpers/createConfigServer";
+const cnf = createConfigServer(config);
+
+>>>>>>> ad324504e6d98d4d9229b45f1d428d8a9ce37811:template-vite-node-ts/src/scripts/test.config.ts
+const apiUrl = `${cnf.protocol}://${cnf.host}:${cnf.port}`;
+const defaultHeaders = {
+    headers: {
+        "user-agent": "fetch-tests",
+        "content-type": "application/json"
+    }
+}
+const fetch = async(
+    input: RequestInfo,
+    init: RequestInit = {}
+) => crossFetch(input, Object.assign({}, defaultHeaders, init));
+
+export {fetch, apiUrl};

package/template-vite-node-ts/tsconfig.json

@@ -23,7 +23,7 @@
     ],
     "types": [
       "vite/client",
-      "node"
+      "node",
     ],
     "baseUrl": ".",
     "paths": {
@@ -33,9 +33,11 @@
     }
   },
   "include": [
-    "./node_modules/vitest/globals.d.ts",
-    "./src/**/*.ts",
-    "./src/**/*.d.ts",
+    "src/**/*.ts",
+    "src/**/*.d.ts",
+    "src/**/*.tsx",
+    "src/**/*.vue",
+    "node_modules/vitest/globals.d.ts"
   ],
   "exclude": [
     "dist"

package/template-vite-node-ts/vite.config.ts

@@ -1,12 +1,13 @@
 import * as path from "path";
+import chalk from "chalk";
 import {build, defineConfig, mergeConfig, Plugin, ResolvedConfig} from "vite";
 import fetch from "cross-fetch";
-
-//@ts-ignore
+// @ts-ignore
 import config from "./connect.json";
 import {createConfigServer} from "./src/backend/server/helpers/createConfigServer";
 import {createMemcached} from "./src/backend/server/helpers/createMemcached";
 import {createMariadb} from "./src/backend/server/helpers/createMariadb";
+import {performance} from "perf_hooks";
 
 declare var process: any;
 interface Options {
@@ -28,6 +29,19 @@ const node = (opt: Options): Plugin => {
                 });
         },
         async configResolved(config:ResolvedConfig) {
+            const time = performance.now();
+            const start = async(resolve: CallableFunction) => {
+                try {
+                    await fetch(`${cnf.protocol}://${cnf.host}:${cnf.port}/start-server`);
+                    const interval = Math.round((performance.now() - time)/10)/100;
+                    console.log(chalk.green('dev server running for ') + chalk.red(`${interval}s`) + chalk.green(' at:'));
+                    console.log(`${cnf.protocol}://${cnf.host}:${cnf.port}`);
+                    resolve();
+                } catch(e: any) {
+                    await start(resolve);
+                }
+            };
+
             if(config.command === "build") {
 
                 // @ts-ignore
@@ -49,22 +63,15 @@ const node = (opt: Options): Plugin => {
                     memcached,
                     memcachedClient
                 };
-
-                const start = async(resolve: CallableFunction) => {
-                    try {
-                        await fetch(`${cnf.protocol}://${cnf.host}:${cnf.port}/start-server`);
-                        resolve();
-                    } catch(e: any) {
-                        await start(resolve);
-                    }
-                };
+                console.log();
+                console.log(chalk.green('dev server starting...'));
                 new Promise(resolve => start(resolve));
             }
         },
         async closeBundle() {
             process.server?.memcachedClient &&  process.server.memcachedClient.close();
             process.server?.db?.home &&  await process.server.db.home.end();
-            process.server.app && await process.server.app.close();
+            process.server?.app && await process.server.app.close();
         }
     }
 }

package/template-vite-node-ts/vitest.config.production.ts

@@ -0,0 +1,41 @@
+/// <reference types="vitest" />
+import path from 'node:path';
+import {defineConfig} from 'vitest/config';
+import vue from '@vitejs/plugin-vue';
+
+process.env.TEST_MODE_APP = "production";
+
+export default defineConfig({
+    resolve: {
+        alias: [
+            {
+                find: /^~(.+)/,
+                replacement: path.resolve('./node_modules') + '/$1',
+            },
+            {
+                find: /@\/(.*)/,
+                replacement: path.resolve('./src') + '/$1',
+            },
+        ],
+    },
+    plugins: [
+        //@ts-ignore
+        vue(),
+    ],
+    test: {
+		root: "./",
+		include: ["**/__its__/**/*.[jt]s?(x)"],
+		exclude: ["**/node_modules/**", "./src/certs/**", "./src/scripts/**", "./src/sql/**", "./src/estimation-client/**"],
+		environment: "jsdom",
+		globals: true,
+		testTimeout: 15000,
+		hookTimeout: 15000,
+        // @ts-ignore
+		singleThread: true,
+        poolOptions: {
+            threads: {
+                singleThread: true
+            }
+        }
+	}
+});

package/template-vite-node-ts/vitest.config.ts

@@ -1,19 +1,43 @@
-import {defineConfig} from "vitest/config";
-import * as path from "path";
+/// <reference types="vitest" />
+import path from 'node:path';
+import { defineConfig } from 'vitest/config';
+import vue from '@vitejs/plugin-vue';
+
+process.env.TEST_MODE_APP = "test";
 
 export default defineConfig({
-    resolve: {
-        alias: [
-            {
-                find: /^~(.+)/,
-                replacement: path.resolve("./node_modules") + "/$1"
-            },
-            {
-                find: /@\/(.*)/,
-                replacement: path.resolve("./src") + "/$1"
-            }
-        ],
-    },
-    plugins: [
-    ]
-});
+	resolve: {
+		alias: [
+			{
+				find: /^~(.+)/,
+				replacement: path.resolve('./node_modules') + '/$1',
+			},
+			{
+				find: /@\/(.*)/,
+				replacement: path.resolve('./src') + '/$1',
+			},
+		],
+	},
+	plugins: [
+		//@ts-ignore
+		vue(),
+	],
+	test: {
+		root: "./",
+		include: ["**/__its__/**/*.[jt]s?(x)", "**/__tests__/**/*.[jt]s?(x)", "**/?(*.)+(spec|test).[jt]s?(x)"],
+		exclude: ["**/node_modules/**", "./src/certs/**", "./src/scripts/**", "./src/sql/**", "./src/estimation-client/**"],
+		environment: "jsdom",
+		globals: true,
+		globalSetup: ["./src/scripts/vitest.global.setup.ts"],
+		testTimeout: 15000,
+		hookTimeout: 15000,
+		// threads: false
+		// @ts-ignore
+		singleThread: true,
+		poolOptions: {
+			threads: {
+				singleThread: true
+			}
+		}
+	},
+});

package/template-vite-node-ts/connect.json

@@ -1,34 +0,0 @@
-{
-    "server": {
-        "development": {
-            "mode": "development",
-            "https": false,
-            "port": 3000,
-            "host": "localhost"
-        },
-        "production": {
-            "mode": "production",
-            "port": 3000,
-            "host": "127.0.0.1",
-            "url": "http://127.0.0.1"
-        }
-    },
-    "db": {
-        "home": {
-            "engine": "mysql",
-            "host": "localhost",
-            "user": "",
-            "password": "",
-            "database": "",
-            "connectTimeout": 10000,
-            "acquireTimeout": 10000,
-            "connectionLimit": 2,
-            "charset": "utf8",
-            "compress": true,
-            "port": 3306,
-            "multipleStatements": true,
-            "namedPlaceholders": true,
-            "dateStrings": true
-        }
-    }
-}

package/template-vite-node-ts/jest.config.ts

@@ -1,37 +0,0 @@
-export default {
-    moduleFileExtensions: [
-        "js",
-        "ts",
-        "json",
-        "vue",
-        "node"
-    ],
-    transform: {
-        "^.+\\.ts$": "ts-jest"
-    },
-    moduleNameMapper: {
-        "@/(.*)$": "<rootDir>/src/$1"
-    },
-    setupFiles: ["./src/scripts/jest.setup.ts"],
-    globalSetup: "./src/scripts/jest.global.setup.ts",
-    globalTeardown: "./src/scripts/jest.global.teardown.ts",
-    testTimeout: 35000,
-    globals: {
-        'ts-jest': {
-            tsconfig: './tsconfig.json',
-            diagnostics: false
-        }
-    },
-    testEnvironment: "jsdom",
-    maxWorkers: 2,
-    testMatch: [ "**/__its__/**/*.[jt]s?(x)", "**/__tests__/**/*.[jt]s?(x)", "**/?(*.)+(spec|test).[jt]s?(x)" ],
-    testPathIgnorePatterns: ["<rootDir>/src/scripts",],
-    collectCoverageFrom: [
-        "**/src/**/*.{ts}",
-        "!**/src/**/*.d.ts",
-        "!**/src/**/index.ts",
-        "!**/src/scripts/**",
-        "!**/src/sql/**",
-        "!**/src/backend/server/web-routes/**",
-    ]
-};

package/template-vite-node-ts/vitest.workspace.ts

@@ -1,20 +0,0 @@
-import {defineWorkspace} from "vitest/config";
-
-export default defineWorkspace([
-
-    {
-        extends: "./vitest.config.ts",
-        test: {
-            name: 'node-main',
-            root: "./src",
-            include: ["**/__its__/**/*.[jt]s?(x)", "**/__tests__/**/*.[jt]s?(x)", "**/?(*.)+(spec|test).[jt]s?(x)"],
-            exclude: ["**/node_modules/**", "./src/certs/**", "./src/scripts/**", "./src/sql/**", "./src/estimation-client/**"],
-            environment: "node",
-            globals: true,
-            globalSetup: ["./src/scripts/vitest.global.setup.ts"],
-            testTimeout: 15000,
-            hookTimeout: 15000,
-            threads: false
-        },
-    }
-])