@sonoransoftware/sonoran.js 1.0.2 → 1.0.5

package/src/structures/CADActiveUnit.ts

@@ -1,85 +1,85 @@
-import { Instance } from '../instance/Instance';
-import { Base } from './Base';
-
-export interface CADActiveUnitStruct {
-  id: number;
-  accId: string;
-  status: number;
-  isPanic: boolean;
-  location: string;
-  aop: string;
-  isDispatch: boolean;
-  data: CADActiveUnitDataStruct;
-}
-
-interface CADActiveUnitStructPartial {
-  id: number;
-  accId: string;
-  status: number;
-  isPanic: boolean;
-  location: string;
-  aop: string;
-  isDispatch: boolean;
-  data: Partial<CADActiveUnitDataStruct>;
-}
-
-export interface CADActiveUnitDataStruct {
-  apiId1: string;
-  apiId2: string;
-  unitNum: string;
-  name: string;
-  district: string;
-  department: string;
-  subdivision: string;
-  rank: string;
-  group: string;
-} 
-
-export type CADActiveUnitResolvable = CADActiveUnit | number;
-
-export class CADActiveUnit extends Base {
-  public id: number = -1;
-  public accId: string = '';
-  public status: number = 0;
-  public isPanic: boolean = false;
-  public location: string = '';
-  public aop: string = '';
-  public isDispatch: boolean = false;
-  public data: CADActiveUnitDataStruct = {
-    apiId1: '',
-    apiId2: '',
-    unitNum: '',
-    name: '',
-    district: '',
-    department: '',
-    subdivision: '',
-    rank: '',
-    group: ''
-  };
-  
-  constructor(instance: Instance, data: any) {
-    super(instance);
-    if (data) this._patch(data);
-  }
-
-  public _patch(data: Partial<CADActiveUnitStructPartial>) {
-    if (data.id !== undefined) this.id = data.id;
-    if (data.accId !== undefined) this.accId = data.accId;
-    if (data.status !== undefined) this.status = data.status;
-    if (data.isPanic !== undefined) this.isPanic = data.isPanic;
-    if (data.location !== undefined) this.location = data.location;
-    if (data.aop !== undefined) this.aop = data.aop;
-    if (data.isDispatch !== undefined) this.isDispatch = data.isDispatch;
-    if (data.data !== undefined) {
-      if (data.data.apiId1 !== undefined) this.data.apiId1 = data.data.apiId1;
-      if (data.data.apiId2 !== undefined) this.data.apiId2 = data.data.apiId2;
-      if (data.data.unitNum !== undefined) this.data.unitNum = data.data.unitNum;
-      if (data.data.name !== undefined) this.data.name = data.data.name;
-      if (data.data.district !== undefined) this.data.district = data.data.district;
-      if (data.data.department !== undefined) this.data.department = data.data.department;
-      if (data.data.subdivision !== undefined) this.data.subdivision = data.data.subdivision;
-      if (data.data.rank !== undefined) this.data.rank = data.data.rank;
-      if (data.data.group !== undefined) this.data.group = data.data.group;
-    }
-  }
+import { Instance } from '../instance/Instance';
+import { Base } from './Base';
+
+export interface CADActiveUnitStruct {
+  id: number;
+  accId: string;
+  status: number;
+  isPanic: boolean;
+  location: string;
+  aop: string;
+  isDispatch: boolean;
+  data: CADActiveUnitDataStruct;
+}
+
+interface CADActiveUnitStructPartial {
+  id: number;
+  accId: string;
+  status: number;
+  isPanic: boolean;
+  location: string;
+  aop: string;
+  isDispatch: boolean;
+  data: Partial<CADActiveUnitDataStruct>;
+}
+
+export interface CADActiveUnitDataStruct {
+  apiId1: string;
+  apiId2: string;
+  unitNum: string;
+  name: string;
+  district: string;
+  department: string;
+  subdivision: string;
+  rank: string;
+  group: string;
+} 
+
+export type CADActiveUnitResolvable = CADActiveUnit | number;
+
+export class CADActiveUnit extends Base {
+  public id: number = -1;
+  public accId: string = '';
+  public status: number = 0;
+  public isPanic: boolean = false;
+  public location: string = '';
+  public aop: string = '';
+  public isDispatch: boolean = false;
+  public data: CADActiveUnitDataStruct = {
+    apiId1: '',
+    apiId2: '',
+    unitNum: '',
+    name: '',
+    district: '',
+    department: '',
+    subdivision: '',
+    rank: '',
+    group: ''
+  };
+  
+  constructor(instance: Instance, data: any) {
+    super(instance);
+    if (data) this._patch(data);
+  }
+
+  public _patch(data: Partial<CADActiveUnitStructPartial>) {
+    if (data.id !== undefined) this.id = data.id;
+    if (data.accId !== undefined) this.accId = data.accId;
+    if (data.status !== undefined) this.status = data.status;
+    if (data.isPanic !== undefined) this.isPanic = data.isPanic;
+    if (data.location !== undefined) this.location = data.location;
+    if (data.aop !== undefined) this.aop = data.aop;
+    if (data.isDispatch !== undefined) this.isDispatch = data.isDispatch;
+    if (data.data !== undefined) {
+      if (data.data.apiId1 !== undefined) this.data.apiId1 = data.data.apiId1;
+      if (data.data.apiId2 !== undefined) this.data.apiId2 = data.data.apiId2;
+      if (data.data.unitNum !== undefined) this.data.unitNum = data.data.unitNum;
+      if (data.data.name !== undefined) this.data.name = data.data.name;
+      if (data.data.district !== undefined) this.data.district = data.data.district;
+      if (data.data.department !== undefined) this.data.department = data.data.department;
+      if (data.data.subdivision !== undefined) this.data.subdivision = data.data.subdivision;
+      if (data.data.rank !== undefined) this.data.rank = data.data.rank;
+      if (data.data.group !== undefined) this.data.group = data.data.group;
+    }
+  }
 }

package/src/structures/CADServer.ts

@@ -1,37 +1,37 @@
-import { Instance } from '../instance/Instance';
-// import { CADActiveUnitsManager } from '../managers/CADActiveUnitsManager';
-import { Base } from './Base';
-
-export interface CADServerData {
-  id: number;
-  config: CADServerConfig;
-}
-
-export interface CADServerConfig {
-  id: number;
-  name: string;
-  description: string;
-  signal: null;
-  mapUrl: string;
-  mapIp: string;
-  mapPort: string;
-  differingOutbound: boolean;
-  outboundIp: string;
-  listenerPort: string;
-  enableMap: boolean;
-  mapType: string;
-  isStatic: boolean;
-}
-
-export class CADServer extends Base {
-  public id: number;
-  public config!: CADServerConfig;
-  // public units!: CADActiveUnitsManager; 
-  
-  constructor(instance: Instance, data: CADServerData) {
-    super(instance);
-    this.id = data.id;
-    this.config = data.config;
-    // this.units = new CADActiveUnitsManager(instance, [], this.id);
-  }
+import { Instance } from '../instance/Instance';
+// import { CADActiveUnitsManager } from '../managers/CADActiveUnitsManager';
+import { Base } from './Base';
+
+export interface CADServerData {
+  id: number;
+  config: CADServerConfig;
+}
+
+export interface CADServerConfig {
+  id: number;
+  name: string;
+  description: string;
+  signal: null;
+  mapUrl: string;
+  mapIp: string;
+  mapPort: string;
+  differingOutbound: boolean;
+  outboundIp: string;
+  listenerPort: string;
+  enableMap: boolean;
+  mapType: string;
+  isStatic: boolean;
+}
+
+export class CADServer extends Base {
+  public id: number;
+  public config!: CADServerConfig;
+  // public units!: CADActiveUnitsManager; 
+  
+  constructor(instance: Instance, data: CADServerData) {
+    super(instance);
+    this.id = data.id;
+    this.config = data.config;
+    // this.units = new CADActiveUnitsManager(instance, [], this.id);
+  }
 }

package/src/structures/CMSServer.ts

@@ -1,26 +1,26 @@
-import { Instance } from '../instance/Instance';
-import { Base } from './Base';
-
-export interface CMSServerData {
-  id: number;
-  config: CMSServerConfig;
-}
-
-export interface CMSServerConfig {
-  id: number;
-  name: string;
-  description: string;
-  allowedRanks: string[];
-  blockedRanks: string[];
-}
-
-export class CMSServer extends Base {
-  public id: number;
-  public config!: CMSServerConfig;
-  
-  constructor(instance: Instance, data: CMSServerData) {
-    super(instance);
-    this.id = data.id;
-    this.config = data.config;
-  }
+import { Instance } from '../instance/Instance';
+import { Base } from './Base';
+
+export interface CMSServerData {
+  id: number;
+  config: CMSServerConfig;
+}
+
+export interface CMSServerConfig {
+  id: number;
+  name: string;
+  description: string;
+  allowedRanks: string[];
+  blockedRanks: string[];
+}
+
+export class CMSServer extends Base {
+  public id: number;
+  public config!: CMSServerConfig;
+  
+  constructor(instance: Instance, data: CMSServerData) {
+    super(instance);
+    this.id = data.id;
+    this.config = data.config;
+  }
 }

package/src/utils/utils.ts

@@ -1,75 +1,75 @@
-import Collection from '@discordjs/collection';
-
-const isObject = (d: any) => typeof d === 'object' && d !== null;
-
-export function mergeDefault(def: any, given: any) {
-  if (!given) return def;
-  for (const key in def) {
-    if (!Object.prototype.hasOwnProperty.call(given, key) || given[key] === undefined) {
-      given[key] = def[key];
-    } else if (given[key] === Object(given[key])) {
-      given[key] = mergeDefault(def[key], given[key]);
-    }
-  }
-  return given;
-}
-
-/**
- * Shallow-copies an object with its class/prototype intact.
- * @param {Object} obj Object to clone
- * @returns {Object}
- * @private
- */
-export function cloneObject(obj: any) {
-  return Object.assign(Object.create(obj), obj);
-}
-
-export function flatten(obj: any, ...props: any[]) {
-  if (!isObject(obj)) return obj;
-
-  const objProps: any[] = Object.keys(obj)
-    .filter((k) => !k.startsWith('_'))
-    .map((k) => ({ [k]: true }));
-
-  props = objProps.length ? Object.assign([...objProps], ...props) : Object.assign({}, ...props); // eslint-disable-line
-
-  const out: Record<any, any> = {};
-
-  for (let [prop, newProp] of Object.entries(props)) {
-    if (!newProp) continue;
-    newProp = newProp === true ? prop : newProp;
-
-    const element = obj[prop];
-    const elemIsObj = isObject(element);
-    const valueOf = elemIsObj && typeof element.valueOf === 'function' ? element.valueOf() : null;
-
-    // If it's a Collection, make the array of keys
-    if (element instanceof Collection) out[newProp] = Array.from(element.keys());
-    // If the valueOf is a Collection, use its array of keys
-    else if (valueOf instanceof Collection) out[newProp] = Array.from(valueOf.keys());
-    // If it's an array, flatten each element
-    else if (Array.isArray(element)) out[newProp] = element.map(e => flatten(e));
-    // If it's an object with a primitive `valueOf`, use that value
-    else if (typeof valueOf !== 'object') out[newProp] = valueOf;
-    // If it's a primitive
-    else if (!elemIsObj) out[newProp] = element;
-  }
-
-  return out;
-}
-
-export function warnLog(message: string): void {
-  return console.log(`[Sonoran.js - DEBUG] ${message}`);
-}
-
-export function infoLog(message: string): void {
-  return console.log(`[Sonoran.js - INFO] ${message}`);
-}
-
-export function errorLog(message: string): void {
-  return console.log(`[Sonoran.js - ERROR] ${message}`);
-}
-
-export function debugLog(message: string): void {
-  return console.log(`[Sonoran.js - DEBUG] ${message}`);
+import Collection from '@discordjs/collection';
+
+const isObject = (d: any) => typeof d === 'object' && d !== null;
+
+export function mergeDefault(def: any, given: any) {
+  if (!given) return def;
+  for (const key in def) {
+    if (!Object.prototype.hasOwnProperty.call(given, key) || given[key] === undefined) {
+      given[key] = def[key];
+    } else if (given[key] === Object(given[key])) {
+      given[key] = mergeDefault(def[key], given[key]);
+    }
+  }
+  return given;
+}
+
+/**
+ * Shallow-copies an object with its class/prototype intact.
+ * @param {Object} obj Object to clone
+ * @returns {Object}
+ * @private
+ */
+export function cloneObject(obj: any) {
+  return Object.assign(Object.create(obj), obj);
+}
+
+export function flatten(obj: any, ...props: any[]) {
+  if (!isObject(obj)) return obj;
+
+  const objProps: any[] = Object.keys(obj)
+    .filter((k) => !k.startsWith('_'))
+    .map((k) => ({ [k]: true }));
+
+  props = objProps.length ? Object.assign([...objProps], ...props) : Object.assign({}, ...props); // eslint-disable-line
+
+  const out: Record<any, any> = {};
+
+  for (let [prop, newProp] of Object.entries(props)) {
+    if (!newProp) continue;
+    newProp = newProp === true ? prop : newProp;
+
+    const element = obj[prop];
+    const elemIsObj = isObject(element);
+    const valueOf = elemIsObj && typeof element.valueOf === 'function' ? element.valueOf() : null;
+
+    // If it's a Collection, make the array of keys
+    if (element instanceof Collection) out[newProp] = Array.from(element.keys());
+    // If the valueOf is a Collection, use its array of keys
+    else if (valueOf instanceof Collection) out[newProp] = Array.from(valueOf.keys());
+    // If it's an array, flatten each element
+    else if (Array.isArray(element)) out[newProp] = element.map(e => flatten(e));
+    // If it's an object with a primitive `valueOf`, use that value
+    else if (typeof valueOf !== 'object') out[newProp] = valueOf;
+    // If it's a primitive
+    else if (!elemIsObj) out[newProp] = element;
+  }
+
+  return out;
+}
+
+export function warnLog(message: string): void {
+  return console.log(`[Sonoran.js - DEBUG] ${message}`);
+}
+
+export function infoLog(message: string): void {
+  return console.log(`[Sonoran.js - INFO] ${message}`);
+}
+
+export function errorLog(message: string): void {
+  return console.log(`[Sonoran.js - ERROR] ${message}`);
+}
+
+export function debugLog(message: string): void {
+  return console.log(`[Sonoran.js - DEBUG] ${message}`);
 }