lupine.api 1.1.58 → 1.1.60

package/dev/plugin-ifelse.js

@@ -1,168 +1,168 @@
-/*
-Esbuild plugin for conditional code logic
-
-A sample:
-#if TEST || DEBUG
-console.log('test');
-#elseif PROD
-console.log('prod');
-#else
-console.log('not test');
-#endif
-
-*/
-const fs = require('fs/promises');
-const path = require('path');
-
-const _saved = {
-  vars: [],
-  baseDir: '',
-  exclude: [],
-};
-
-const LINE_FLAG = {
-  code: 0,
-  if: 1,
-  else: 2,
-  endif: 3,
-};
-
-const ifRegExp = /^\/\/\s*#if\s*(.*)$/;
-const elseifRegExp = /^\/\/\s*#elseif\s*(.*)$/;
-const elseRegExp = /^\/\/\s*#else\s*(.*)$/;
-const endifRegExp = /^\/\/\s*#endif$/;
-const ifdefRegExpMultiLine = new RegExp(`^${ifRegExp.source}`, 'gm');
-
-// if a variable is not defined, exception will be thrown
-// if a variable is '', 0, false, undefined, null, NaN, it will be considered as false
-/*
-var vars = {
-    TEST1: '', // false
-    TEST2: '2',
-}
-evalExpression(vars, 'TEST1'); // false
-evalExpression(vars, 'TEST2'); // true
-try {
-    evalExpression(vars, 'TEST3'); // exception
-} catch {}
-evalExpression(vars, "TEST2===`2` && TEST2==='2'"); // true, can't use ["] in the exception
-evalExpression(vars, "TEST1 || TEST2"); // true
-
-TODO: define variables if it's not defined?
-function extractVariables(expression) {
-  // Match words that are not numbers or keywords
-  const variableRegex = /\b([a-zA-Z_][a-zA-Z0-9_]*)\b/g;
-  return [...new Set(expression.match(variableRegex) || [])];
-}
-*/
-const evalExpression = (vars, expression) => {
-  const variables = Object.freeze({ ...vars });
-  const fn = new Function(...Object.keys(variables), 'return eval("' + expression + '")');
-  const result = !!fn(...Object.values(variables));
-  console.log(`Expression [${expression}], result: ${result}`);
-  return result;
-};
-
-const processOneFile = async (vars, fpath) => {
-  let text = await fs.readFile(fpath, 'utf8');
-  if (!ifdefRegExpMultiLine.test(text)) {
-    return null;
-  }
-
-  let lines = text.replace(/\r\n/g, '\n').replace(/\r/g, '\n').split('\n');
-  let line = '';
-  let expression = '';
-  let keepLine = true;
-  let lineType = LINE_FLAG.code;
-  const saveLines = [];
-  for (let i = 0; i < lines.length; i++) {
-    line = lines[i];
-
-    let matchIf = line.match(ifRegExp);
-    let matchElseIf = line.match(elseifRegExp);
-    if (matchIf) {
-      lineType = LINE_FLAG.if;
-      expression = matchIf[1].trim();
-    } else if (matchElseIf) {
-      lineType = LINE_FLAG.if;
-      expression = matchElseIf[1].trim();
-    } else if (line.match(elseRegExp)) {
-      lineType = LINE_FLAG.else;
-    } else if (line.match(endifRegExp)) {
-      lineType = LINE_FLAG.endif;
-    } else {
-      lineType = LINE_FLAG.code;
-    }
-
-    if (lineType === LINE_FLAG.if) {
-      keepLine = true;
-      const result = evalExpression(vars, expression);
-      if (!result) {
-        keepLine = false;
-      }
-    }
-    if (lineType === LINE_FLAG.else) {
-      console.log(`Expression else`);
-      keepLine = !keepLine;
-    }
-    if (lineType === LINE_FLAG.code) {
-      if (keepLine) {
-        saveLines.push(line);
-      }
-    }
-    if (lineType === LINE_FLAG.endif) {
-      keepLine = true;
-    }
-  }
-
-  text = saveLines.join('\n');
-  return text;
-};
-
-async function pluginOnLoad(args) {
-  let fPath = path.relative(_saved.baseDir, args.path);
-  let skip = false;
-
-  for (let filter of _saved.exclude) {
-    if (fPath.startsWith(filter)) {
-      skip = true;
-      break;
-    }
-  }
-
-  if (skip) {
-    return null;
-  }
-
-  const text = await processOneFile(_saved.vars, args.path);
-  if (text) {
-    return {
-      contents: text,
-      loader: path.extname(args.path).substring(1),
-    };
-  } else {
-    return null;
-  }
-}
-
-const DEFAULT_EXCLUDE_LIST = ['dist', 'node_modules'];
-const DEFAULT_EXTENSION_LIST = ['.js', '.jsx', '.ts', '.tsx'];
-module.exports = (
-  vars,
-  baseDir = process.cwd(),
-  exclude = DEFAULT_EXCLUDE_LIST,
-  extension = DEFAULT_EXTENSION_LIST
-) => {
-  _saved.vars = vars;
-  _saved.baseDir = baseDir;
-  _saved.exclude = exclude;
-  const filter = {
-    filter: new RegExp(`(${extension.join('|')})$`),
-  };
-  return {
-    name: 'plugin-ifdef',
-    setup(build) {
-      build.onLoad(filter, pluginOnLoad);
-    },
-  };
-};
+/*
+Esbuild plugin for conditional code logic
+
+A sample:
+#if TEST || DEBUG
+console.log('test');
+#elseif PROD
+console.log('prod');
+#else
+console.log('not test');
+#endif
+
+*/
+const fs = require('fs/promises');
+const path = require('path');
+
+const _saved = {
+  vars: [],
+  baseDir: '',
+  exclude: [],
+};
+
+const LINE_FLAG = {
+  code: 0,
+  if: 1,
+  else: 2,
+  endif: 3,
+};
+
+const ifRegExp = /^\/\/\s*#if\s*(.*)$/;
+const elseifRegExp = /^\/\/\s*#elseif\s*(.*)$/;
+const elseRegExp = /^\/\/\s*#else\s*(.*)$/;
+const endifRegExp = /^\/\/\s*#endif$/;
+const ifdefRegExpMultiLine = new RegExp(`^${ifRegExp.source}`, 'gm');
+
+// if a variable is not defined, exception will be thrown
+// if a variable is '', 0, false, undefined, null, NaN, it will be considered as false
+/*
+var vars = {
+    TEST1: '', // false
+    TEST2: '2',
+}
+evalExpression(vars, 'TEST1'); // false
+evalExpression(vars, 'TEST2'); // true
+try {
+    evalExpression(vars, 'TEST3'); // exception
+} catch {}
+evalExpression(vars, "TEST2===`2` && TEST2==='2'"); // true, can't use ["] in the exception
+evalExpression(vars, "TEST1 || TEST2"); // true
+
+TODO: define variables if it's not defined?
+function extractVariables(expression) {
+  // Match words that are not numbers or keywords
+  const variableRegex = /\b([a-zA-Z_][a-zA-Z0-9_]*)\b/g;
+  return [...new Set(expression.match(variableRegex) || [])];
+}
+*/
+const evalExpression = (vars, expression) => {
+  const variables = Object.freeze({ ...vars });
+  const fn = new Function(...Object.keys(variables), 'return eval("' + expression + '")');
+  const result = !!fn(...Object.values(variables));
+  console.log(`Expression [${expression}], result: ${result}`);
+  return result;
+};
+
+const processOneFile = async (vars, fpath) => {
+  let text = await fs.readFile(fpath, 'utf8');
+  if (!ifdefRegExpMultiLine.test(text)) {
+    return null;
+  }
+
+  let lines = text.replace(/\r\n/g, '\n').replace(/\r/g, '\n').split('\n');
+  let line = '';
+  let expression = '';
+  let keepLine = true;
+  let lineType = LINE_FLAG.code;
+  const saveLines = [];
+  for (let i = 0; i < lines.length; i++) {
+    line = lines[i];
+
+    let matchIf = line.match(ifRegExp);
+    let matchElseIf = line.match(elseifRegExp);
+    if (matchIf) {
+      lineType = LINE_FLAG.if;
+      expression = matchIf[1].trim();
+    } else if (matchElseIf) {
+      lineType = LINE_FLAG.if;
+      expression = matchElseIf[1].trim();
+    } else if (line.match(elseRegExp)) {
+      lineType = LINE_FLAG.else;
+    } else if (line.match(endifRegExp)) {
+      lineType = LINE_FLAG.endif;
+    } else {
+      lineType = LINE_FLAG.code;
+    }
+
+    if (lineType === LINE_FLAG.if) {
+      keepLine = true;
+      const result = evalExpression(vars, expression);
+      if (!result) {
+        keepLine = false;
+      }
+    }
+    if (lineType === LINE_FLAG.else) {
+      console.log(`Expression else`);
+      keepLine = !keepLine;
+    }
+    if (lineType === LINE_FLAG.code) {
+      if (keepLine) {
+        saveLines.push(line);
+      }
+    }
+    if (lineType === LINE_FLAG.endif) {
+      keepLine = true;
+    }
+  }
+
+  text = saveLines.join('\n');
+  return text;
+};
+
+async function pluginOnLoad(args) {
+  let fPath = path.relative(_saved.baseDir, args.path);
+  let skip = false;
+
+  for (let filter of _saved.exclude) {
+    if (fPath.startsWith(filter)) {
+      skip = true;
+      break;
+    }
+  }
+
+  if (skip) {
+    return null;
+  }
+
+  const text = await processOneFile(_saved.vars, args.path);
+  if (text) {
+    return {
+      contents: text,
+      loader: path.extname(args.path).substring(1),
+    };
+  } else {
+    return null;
+  }
+}
+
+const DEFAULT_EXCLUDE_LIST = ['dist', 'node_modules'];
+const DEFAULT_EXTENSION_LIST = ['.js', '.jsx', '.ts', '.tsx'];
+module.exports = (
+  vars,
+  baseDir = process.cwd(),
+  exclude = DEFAULT_EXCLUDE_LIST,
+  extension = DEFAULT_EXTENSION_LIST
+) => {
+  _saved.vars = vars;
+  _saved.baseDir = baseDir;
+  _saved.exclude = exclude;
+  const filter = {
+    filter: new RegExp(`(${extension.join('|')})$`),
+  };
+  return {
+    name: 'plugin-ifdef',
+    setup(build) {
+      build.onLoad(filter, pluginOnLoad);
+    },
+  };
+};

package/dev/plugin-ifelse.test.js

@@ -1,37 +1,37 @@
-/*
-(async () => {
-    var vars = {
-        TEST: undefined,
-        TEST1: '', // false
-        TEST2: '2',
-        PROD: false,
-    }
-      const x = await processOneFile(vars, 'test.js');
-  console.log(x);
-  process.exit(0);
-})();
-*/
-console.log('test start');
-console.log('test start');
-// #if TEST
-console.log('test');
-// #elseif PROD
-console.log('prod');
-// #else
-console.log('not test');
-// #endif
-console.log('test end');
-console.log('test end');
-// #if TEST1 && TEST2
-console.log('test1 and test2');
-// #endif
-
-// #if TEST1 || TEST2
-console.log('test1 or test2');
-// #endif
-
-// #if TEST2
-console.log('test2');
-// #endif
-console.log('test end');
-console.log('test end');
+/*
+(async () => {
+    var vars = {
+        TEST: undefined,
+        TEST1: '', // false
+        TEST2: '2',
+        PROD: false,
+    }
+      const x = await processOneFile(vars, 'test.js');
+  console.log(x);
+  process.exit(0);
+})();
+*/
+console.log('test start');
+console.log('test start');
+// #if TEST
+console.log('test');
+// #elseif PROD
+console.log('prod');
+// #else
+console.log('not test');
+// #endif
+console.log('test end');
+console.log('test end');
+// #if TEST1 && TEST2
+console.log('test1 and test2');
+// #endif
+
+// #if TEST1 || TEST2
+console.log('test1 or test2');
+// #endif
+
+// #if TEST2
+console.log('test2');
+// #endif
+console.log('test end');
+console.log('test end');

package/dev/run-cmd.js

@@ -1,14 +1,14 @@
-const cp = require('child_process');
-
-exports.runCmd = (cmd) => {
-  const child = cp.spawn(`npm run ${cmd}`, { shell: true });
-  console.log(`[dev-server] Run: ${cmd}`);
-  // child.stdout.on('data', (data) => {
-  //   process.stdout.write(`${data}`);
-  // });
-  // child.stderr.on('data', (data) => {
-  //   process.stdout.write(`${data}`);
-  // });
-  child.stdout.pipe(process.stdout);
-  child.stderr.pipe(process.stderr);
-};
+const cp = require('child_process');
+
+exports.runCmd = (cmd) => {
+  const child = cp.spawn(`npm run ${cmd}`, { shell: true });
+  console.log(`[dev-server] Run: ${cmd}`);
+  // child.stdout.on('data', (data) => {
+  //   process.stdout.write(`${data}`);
+  // });
+  // child.stderr.on('data', (data) => {
+  //   process.stdout.write(`${data}`);
+  // });
+  child.stdout.pipe(process.stdout);
+  child.stderr.pipe(process.stderr);
+};

package/dev/send-request.js

@@ -1,12 +1,12 @@
-exports.sendRequest = async (url, waitSeconds) => {
-  try {
-    // need node 18
-    const ret = await fetch(url, {
-      signal: AbortSignal.timeout(waitSeconds * 1000),
-    });
-    waitSeconds > 0 && (await new Promise((r) => setTimeout(r, waitSeconds * 1000)));
-    return ret;
-  } catch (err) {
-    console.error('sendRequest error: ', err);
-  }
-};
+exports.sendRequest = async (url, waitSeconds) => {
+  try {
+    // need node 18
+    const ret = await fetch(url, {
+      signal: AbortSignal.timeout(waitSeconds * 1000),
+    });
+    waitSeconds > 0 && (await new Promise((r) => setTimeout(r, waitSeconds * 1000)));
+    return ret;
+  } catch (err) {
+    console.error('sendRequest error: ', err);
+  }
+};

package/package.json

@@ -1,55 +1,55 @@
-{
-  "name": "lupine.api",
-  "version": "1.1.58",
-  "license": "MIT",
-  "author": "uuware.com",
-  "homepage": "https://github.com/uuware/lupine.js",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/uuware/lupine.js.git",
-    "directory": "packages/lupine.api"
-  },
-  "description": "lupine.api is a fast, lightweight, and flexible node.js based server, working with lupine.web to provide SSR and modern JavaScript features for web applications and APIs.",
-  "main": "src/index.ts",
-  "source": "src/index.ts",
-  "types": "src/index.ts",
-  "engines": {
-    "node": ">= 20"
-  },
-  "exports": {
-    ".": {
-      "types": "./src/index.ts",
-      "umd": "./src/index.ts",
-      "import": "./src/index.ts",
-      "require": "./src/index.ts"
-    },
-    "./admin": {
-      "types": "./admin/index.ts",
-      "import": "./admin/index.ts",
-      "require": "./admin/index.ts"
-    },
-    "./dev": {
-      "require": "./dev/index.js"
-    }
-  },
-  "keywords": [
-    "backend-end",
-    "lightweight"
-  ],
-  "scripts": {
-    "note": "echo 'build is not needed as the typescript code is supposed to be referred directly from other projects'",
-    "npm-publish": "npm publish --access public",
-    "build": "tsc"
-  },
-  "dependencies": {
-    "better-sqlite3": "^11.9.1",
-    "lupine.web": "^1.0.0",
-    "lupine.components": "^1.0.0"
-  },
-  "optionalDependencies": {
-    "mysql2": "^3.0.0"
-  },
-  "devDependencies": {
-    "@types/better-sqlite3": "^7.6.12"
-  }
-}
+{
+  "name": "lupine.api",
+  "version": "1.1.60",
+  "license": "MIT",
+  "author": "uuware.com",
+  "homepage": "https://github.com/uuware/lupine.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/uuware/lupine.js.git",
+    "directory": "packages/lupine.api"
+  },
+  "description": "lupine.api is a fast, lightweight, and flexible node.js based server, working with lupine.web to provide SSR and modern JavaScript features for web applications and APIs.",
+  "main": "src/index.ts",
+  "source": "src/index.ts",
+  "types": "src/index.ts",
+  "engines": {
+    "node": ">= 20"
+  },
+  "exports": {
+    ".": {
+      "types": "./src/index.ts",
+      "umd": "./src/index.ts",
+      "import": "./src/index.ts",
+      "require": "./src/index.ts"
+    },
+    "./admin": {
+      "types": "./admin/index.ts",
+      "import": "./admin/index.ts",
+      "require": "./admin/index.ts"
+    },
+    "./dev": {
+      "require": "./dev/index.js"
+    }
+  },
+  "keywords": [
+    "backend-end",
+    "lightweight"
+  ],
+  "scripts": {
+    "note": "echo 'build is not needed as the typescript code is supposed to be referred directly from other projects'",
+    "npm-publish": "npm publish --access public",
+    "build": "tsc"
+  },
+  "dependencies": {
+    "better-sqlite3": "^11.9.1",
+    "lupine.web": "^1.0.0",
+    "lupine.components": "^1.0.0"
+  },
+  "optionalDependencies": {
+    "mysql2": "^3.0.0"
+  },
+  "devDependencies": {
+    "@types/better-sqlite3": "^7.6.12"
+  }
+}