express-generator-typescript 2.5.21 → 2.5.42

package/lib/project-files/package.json

@@ -6,7 +6,7 @@
     "clean-install": "rm -rf ./node_modules && rm -r package-lock.json && npm i",
     "dev": "NODE_ENV=development ts-node ./src",
     "dev:hot": "nodemon --exec \"npm run dev\" --watch ./src --ext .ts",
-    "lint": "eslint --flag unstable_ts_config",
+    "lint": "eslint .",
     "start": "NODE_ENV=production node -r ./config.js ./dist",
     "test": "NODE_ENV=test ts-node ./spec",
     "test:hot": "nodemon --exec \"npm run test\" --watch ./src --watch ./spec --ext .ts",
@@ -26,7 +26,7 @@
     "jet-env": "^1.1.4",
     "jet-logger": "^2.0.1",
     "jet-paths": "^1.1.0",
-    "jet-validators": "^1.3.3",
+    "jet-validators": "^1.3.7",
     "jsonfile": "^6.1.0",
     "module-alias": "^2.2.2",
     "morgan": "^1.10.0"

package/lib/project-files/spec/index.ts

@@ -5,46 +5,66 @@ import { argv } from 'process';
 
 
 /******************************************************************************
-                              Run
+                                Run
 ******************************************************************************/
 
-// Init Jasmine
-const jasmine = new Jasmine();
-jasmine.exitOnCompletion = false;
-
-// Set location of test files
-jasmine.loadConfig({
-  random: true,
-  spec_dir: 'spec',
-  spec_files: [
-    './tests/**/*.spec.ts',
-  ],
-  stopSpecOnExpectationFailure: false,
-});
-
-// Run all or a single unit-test
-let execResp: Promise<jasmine.JasmineDoneInfo> | undefined;
-if (!!argv[2]) {
-  const testFile = argv[2];
-  find.file(testFile + '.spec.ts', './spec', (files: string[]) => {
-    if (files.length === 1) {
-      jasmine.execute([files[0]]);
+// Start
+(async () => {
+  try {
+    // Init Jasmine
+    const jasmine = new Jasmine();
+    jasmine.exitOnCompletion = false;
+    // Set location of test files
+    jasmine.loadConfig({
+      random: true,
+      spec_dir: 'spec',
+      spec_files: [
+        './tests/**/*.spec.ts',
+      ],
+      stopSpecOnExpectationFailure: false,
+    });
+    // Run all or a single unit-test
+    let doneInfo: jasmine.JasmineDoneInfo;
+    if (!!argv[2]) {
+      const files = await findFile(argv[2]);
+      if (files.length === 1) {
+        doneInfo = await jasmine.execute([files[0]]);
+      } else {
+        return logger.err('Test file not found!');
+      }
     } else {
-      logger.err('Test file not found!');
+      doneInfo = await jasmine.execute();
     }
-  });
-} else {
-  execResp = jasmine.execute();
-}
-
-// Wait for tests to finish
-(async () => {
-  if (!!execResp) {
-    const info = await execResp;
-    if (info.overallStatus === 'passed') {
+    // Wait for tests to finish
+    if (doneInfo?.overallStatus === 'passed') {
       logger.info('All tests have passed :)');
+    } else if (doneInfo?.overallStatus === 'incomplete') {
+      logger.warn('Some tests did not complete or were skipped');
     } else {
       logger.err('At least one test has failed :(');
     }
+  } catch (err: unknown) {
+    return logger.err(err);
   }
 })();
+
+
+/******************************************************************************
+                                Functions
+******************************************************************************/
+
+/**
+ * Wrap find file in a promise.
+ */
+function findFile(testFile: string): Promise<string[]> {
+  return new Promise((res, rej) => {
+    return find.file(testFile + '.spec.ts', './spec', (files: string[]) => {
+      if (files.length > 0) {
+        return res(files);
+      } else {
+        const err = new Error('Test file not found!');
+        return rej(err);
+      }
+    });
+  });
+}

package/lib/project-files/src/models/User.ts

@@ -28,6 +28,19 @@ export interface IUser {
 }
 
 
+/******************************************************************************
+                                 Functions
+******************************************************************************/
+
+// Initialize the parse function
+const parseUser = parseObject<IUser>({
+  id: isRelationalKey,
+  name: isString,
+  email: isString,
+  created: transIsDate,
+});
+
+
 /******************************************************************************
                                  Functions
 ******************************************************************************/
@@ -49,16 +62,6 @@ function testUser(arg: unknown, errCb?: TParseOnError): arg is IUser {
   return !!parseUser(arg, errCb);
 }
 
-/**
- * Parse a user object.
- */
-const parseUser = parseObject<IUser>({
-  id: isRelationalKey,
-  name: isString,
-  email: isString,
-  created: transIsDate,
-});
-
 
 /******************************************************************************
                                 Export default

package/lib/project-files/src/repos/database.test.json

@@ -1 +1 @@
-{"users":[{"id":838545008111,"name":"Bill","created":"2025-03-10T20:05:08.878Z","email":"sean.maxwell@gmail.com"},{"id":310043743347,"name":"John Smith","created":"2025-03-10T20:05:08.878Z","email":"john.smith@gmail.com"},{"id":989411758607,"name":"Gordan Freeman","created":"2025-03-10T20:05:08.878Z","email":"gordan.freeman@gmail.com"}]}
+{"users":[{"id":842773089876,"name":"Bill","created":"2025-03-12T20:02:55.286Z","email":"sean.maxwell@gmail.com"},{"id":941309339231,"name":"John Smith","created":"2025-03-12T20:02:55.286Z","email":"john.smith@gmail.com"},{"id":757043111392,"name":"Gordan Freeman","created":"2025-03-12T20:02:55.286Z","email":"gordan.freeman@gmail.com"}]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-generator-typescript",
-  "version": "2.5.21",
+  "version": "2.5.42",
   "description": "Generate new Express applications similar to express-generate which but sets it up to use TypeScript instead",
   "scripts": {
     "express-generator-typescript": "node bin/cli.js",