express-generator-typescript 2.7.10 → 2.7.12

package/lib/project-files/src/{index.ts → main.ts}

@@ -1,27 +1,24 @@
-import logger from 'jet-logger';
-
-import ENV from '@src/common/constants/ENV';
-import server from './server';
-
-
-/******************************************************************************
-                                Constants
-******************************************************************************/
-
-const SERVER_START_MSG = (
-  'Express server started on port: ' + ENV.Port.toString()
-);
-
-
-/******************************************************************************
-                                  Run
-******************************************************************************/
-
-// Start the server
-server.listen(ENV.Port, err => {
-  if (!!err) {
-    logger.err(err.message);
-  } else {
-    logger.info(SERVER_START_MSG);
-  }
-});
+import logger from 'jet-logger';
+
+import EnvVars from './common/constants/env';
+import server from './server';
+
+/******************************************************************************
+                                Constants
+******************************************************************************/
+
+const SERVER_START_MSG =
+  'Express server started on port: ' + EnvVars.Port.toString();
+
+/******************************************************************************
+                                  Run
+******************************************************************************/
+
+// Start the server
+server.listen(EnvVars.Port, (err) => {
+  if (!!err) {
+    logger.err(err.message);
+  } else {
+    logger.info(SERVER_START_MSG);
+  }
+});

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

@@ -1,70 +1,69 @@
-import { isString, isUnsignedInteger } from 'jet-validators';
-import { parseObject, OnErrorCallback } from 'jet-validators/utils';
-
-import { transformIsDate } from '@src/common/util/validators';
-import { IModel } from './common/types';
-
-/******************************************************************************
-                                 Constants
-******************************************************************************/
-
-const DEFAULT_USER_VALS: IUser = {
-  id: 0,
-  name: '',
-  created: new Date(),
-  email: '',
-} as const;
-
-/******************************************************************************
-                                  Types
-******************************************************************************/
-
-export interface IUser extends IModel {
-  name: string;
-  email: string;
-}
-
-/******************************************************************************
-                                  Setup
-******************************************************************************/
-
-// Initialize the "parseUser" function
-const parseUser = parseObject<IUser>({
-  id: isUnsignedInteger,
-  name: isString,
-  email: isString,
-  created: transformIsDate,
-});
-
-/******************************************************************************
-                                 Functions
-******************************************************************************/
-
-/**
- * New user object.
- */
-function __new__(user?: Partial<IUser>): IUser {
-  const defaults = { ...DEFAULT_USER_VALS };
-  defaults.created = new Date();
-  return parseUser({ ...defaults, ...user }, errors => {
-    throw new Error('Setup new user failed ' + JSON.stringify(errors, null, 2));
-  });
-}
-
-/**
- * Check is a user object. For the route validation.
- */
-
-// because this isn't marked with the symbol, the errors are not bubbling up
-function test(arg: unknown, errCb?: OnErrorCallback): arg is IUser {
-  return !!parseUser(arg, errCb);
-}
-
-/******************************************************************************
-                                Export default
-******************************************************************************/
-
-export default {
-  new: __new__,
-  test,
-} as const;
+import { isNonEmptyString, isString, isUnsignedInteger } from 'jet-validators';
+import { parseObject, Schema, testObject } from 'jet-validators/utils';
+
+import { transformIsDate } from '@src/common/utils/validators';
+
+import { IModel } from './common/IModel';
+
+/******************************************************************************
+                                 Constants
+******************************************************************************/
+
+const GetDefaults = (): IUser => ({
+  id: 0,
+  name: '',
+  email: '',
+  created: new Date(),
+});
+
+/******************************************************************************
+                                  Types
+******************************************************************************/
+
+export interface IUser extends IModel {
+  name: string;
+  email: string;
+}
+
+/******************************************************************************
+                                  Setup
+******************************************************************************/
+
+const schema: Schema<IUser> = {
+  id: isUnsignedInteger,
+  name: isString,
+  email: isString,
+  created: transformIsDate,
+};
+
+// Set the "parseUser" function
+const parseUser = parseObject<IUser>(schema);
+
+// For the APIs make sure the right fields are complete
+const testIsCompleteUser = testObject<IUser>({
+  ...schema,
+  name: isNonEmptyString,
+  email: isNonEmptyString,
+});
+
+/******************************************************************************
+                                 Functions
+******************************************************************************/
+
+/**
+ * New user object.
+ */
+function __new__(user?: Partial<IUser>): IUser {
+  return parseUser({ ...GetDefaults(), ...user }, (errors) => {
+    throw new Error('Setup new user failed ' + JSON.stringify(errors, null, 2));
+  });
+}
+
+/******************************************************************************
+                                Export default
+******************************************************************************/
+
+export default {
+  new: __new__,
+  isComplete: testIsCompleteUser,
+} as const;

package/lib/project-files/src/models/common/{types.ts → IModel.ts}

@@ -1,5 +1,4 @@
-
-export interface IModel {
-  id: number;
-  created: Date;
-}
+export interface IModel {
+  id: number;
+  created: Date;
+}

package/lib/project-files/src/public/stylesheets/users.css

@@ -1,48 +1,50 @@
-body {
-  padding: 100px;
-  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
-}
-
-body .users-column {
-  display: inline-block;
-  margin-right: 2em;
-  vertical-align: top;
-}
-
-body .users-column .column-header {
-  padding-bottom: 5px;
-  font-weight: 700;
-  font-size: 1.2em;
-}
-
-
-/** Add User Column **/
-
-body .add-user-col input {
-  margin-bottom: 10px;
-}
-
-body .add-user-col #add-user-btn {
-  margin-top: 2px;
-  margin-bottom: 10px;
-}
-
-
-/** Users Display Column **/
-
-.email-edit {
-  padding-bottom: 8px;
-}
-
-body .users-column .user-display-ele {
-  padding-bottom: 10px;
-}
-
-body .users-column .user-display-ele button {
-  margin-top: 2px;
-  margin-bottom: 10px;
-}
-
-body .users-column .user-display-ele .edit-view {
-  display: none;
-}
+body {
+  padding: 100px;
+  font:
+    14px 'Lucida Grande',
+    Helvetica,
+    Arial,
+    sans-serif;
+}
+
+body .users-column {
+  display: inline-block;
+  margin-right: 2em;
+  vertical-align: top;
+}
+
+body .users-column .column-header {
+  padding-bottom: 5px;
+  font-weight: 700;
+  font-size: 1.2em;
+}
+
+/** Add User Column **/
+
+body .add-user-col input {
+  margin-bottom: 10px;
+}
+
+body .add-user-col #add-user-btn {
+  margin-top: 2px;
+  margin-bottom: 10px;
+}
+
+/** Users Display Column **/
+
+.email-edit {
+  padding-bottom: 8px;
+}
+
+body .users-column .user-display-ele {
+  padding-bottom: 10px;
+}
+
+body .users-column .user-display-ele button {
+  margin-top: 2px;
+  margin-bottom: 10px;
+}
+
+body .users-column .user-display-ele .edit-view {
+  display: none;
+}

package/lib/project-files/src/repos/MockOrm.ts

@@ -1,63 +1,57 @@
-import jsonfile from 'jsonfile';
-
-import ENV from '@src/common/constants/ENV';
-import { NODE_ENVS } from '@src/common/constants';
-import { IUser } from '@src/models/User';
-
-
-/******************************************************************************
-                                Constants
-******************************************************************************/
-
-const DB_FILE_NAME = (
-  ENV.NodeEnv === NODE_ENVS.Test 
-    ? 'database.test.json' 
-    : 'database.json'
-);
-
-
-/******************************************************************************
-                                Types
-******************************************************************************/
-
-interface IDatabase {
-  users: IUser[];
-}
-
-
-/******************************************************************************
-                                Functions
-******************************************************************************/
-
-/**
- * Fetch the json from the file.
- */
-function openDb(): Promise<IDatabase> {
-  return jsonfile.readFile(__dirname + '/' + DB_FILE_NAME) as 
-    Promise<IDatabase>;
-}
-
-/**
- * Update the file.
- */
-function saveDb(db: IDatabase): Promise<void> {
-  return jsonfile.writeFile((__dirname + '/' + DB_FILE_NAME), db);
-}
-
-/**
- * Empty the database
- */
-function cleanDb(): Promise<void> {
-  return jsonfile.writeFile((__dirname + '/' + DB_FILE_NAME), {});
-}
-
-
-/******************************************************************************
-                                Export default
-******************************************************************************/
-
-export default {
-  openDb,
-  saveDb,
-  cleanDb,
-} as const;
+import jsonfile from 'jsonfile';
+
+import EnvVars, { NodeEnvs } from '@src/common/constants/env';
+import { IUser } from '@src/models/User';
+
+/******************************************************************************
+                                Constants
+******************************************************************************/
+
+const DATABASE_FILE_PATH = __dirname + '/common' + (
+  EnvVars.NodeEnv === NodeEnvs.TEST 
+  ? '/database.test.json' 
+  : '/database.json'
+);
+
+/******************************************************************************
+                                Types
+******************************************************************************/
+
+interface IDatabase {
+  users: IUser[];
+}
+
+/******************************************************************************
+                                Functions
+******************************************************************************/
+
+/**
+ * Fetch the json from the file.
+ */
+function openDb(): Promise<IDatabase> {
+  return jsonfile.readFile(DATABASE_FILE_PATH) as Promise<IDatabase>;
+}
+
+/**
+ * Update the file.
+ */
+function saveDb(db: IDatabase): Promise<void> {
+  return jsonfile.writeFile(DATABASE_FILE_PATH, db);
+}
+
+/**
+ * Empty the database
+ */
+function cleanDb(): Promise<void> {
+  return jsonfile.writeFile( DATABASE_FILE_PATH, {});
+}
+
+/******************************************************************************
+                                Export default
+******************************************************************************/
+
+export default {
+  openDb,
+  saveDb,
+  cleanDb,
+} as const;