Prepare freelancer-rates analyzer

.babelrc

@@ -10,7 +10,6 @@
         "targets": {
           "node": "current"
         }
-
       }
     ],
     "@babel/preset-typescript"

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.20.0
+
+- Replace generic ExemplarAnalyzer for `freelancer-rates` with specific analyzer stub
+
 ## 0.19.0
 
 - Add analyzer for `concept/annalyns-infiltration`
@@ -11,7 +15,7 @@
 
 ## 0.17.1
 
-- Change the way autoloads work so they are more predicatable
+- Change the way autoload work so they are more predictable
 
 ## 0.17.0
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exercism/javascript-analyzer",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "Exercism analyzer for javascript",
   "repository": "https://github.com/exercism/javascript-analyzer",
   "author": "Derk-Jan Karrenbeld <[email protected]>",

src/analyzers/concept/freelancer-rates/FreelancerRatesSolution.ts

@@ -13,43 +13,52 @@ import { PublicApi } from '../../PublicApi'
 import { parameterName } from '../../utils/extract_parameter'
 
 export const DAY_RATE = 'dayRate'
-export const MONTH_RATE = 'monthRate'
+export const MONTH_RATE = 'priceWithMonthlyDiscount'
 export const DAYS_IN_BUDGET = 'daysInBudget'
 
 class DayRate extends PublicApi {
   public get ratePerHourParameter(): string {
     return this.parameter
   }
+
+  // return ratePerHour * 8;
+  // return 8 * ratePerHour;
+  // return ratePerHour * HOURS_IN_DAY;
+  // return HOURS_IN_DAY * ratePerHour;
 }
 
-class MonthRate extends PublicApi {
-  public get ratePerHourParameter(): string {
+class DaysInBudget extends PublicApi {
+  public get budgetParameter(): string {
     return this.parameter
   }
 
-  public readonly discountParameter: string
+  public readonly ratePerHourParameter: string
 
   constructor(implementation: ExtractedFunction) {
     super(implementation)
 
-    this.discountParameter = parameterName(this.implementation.params[1])
+    this.ratePerHourParameter = parameterName(this.implementation.params[1])
   }
+
+  // return Math.floor(budget / dayRate(ratePerHour));
 }
 
-class DaysInBudget extends PublicApi {
-  public get budgetParameter(): string {
+class MonthRate extends PublicApi {
+  public get ratePerHourParameter(): string {
     return this.parameter
   }
 
-  public readonly ratePerHourParameter: string
+  public readonly daysParameter: string
   public readonly discountParameter: string
 
   constructor(implementation: ExtractedFunction) {
     super(implementation)
 
-    this.ratePerHourParameter = parameterName(this.implementation.params[1])
+    this.daysParameter = parameterName(this.implementation.params[1])
     this.discountParameter = parameterName(this.implementation.params[2])
   }
+
+  // Expect ceil
 }
 
 export class FreelancerRatesSolution {

src/analyzers/utils/extract_parameter.ts

@@ -8,9 +8,13 @@ type VariableDeclarator = TSESTree.VariableDeclarator
 type DestructuringPattern = TSESTree.DestructuringPattern
 
 export function parameterName(
-  parameter: Parameter | VariableDeclarator,
+  parameter: Parameter | VariableDeclarator | undefined,
   fallback = '<unknown>'
 ): string {
+  if (parameter === undefined) {
+    return '<undefined>'
+  }
+
   switch (parameter.type) {
     case AST_NODE_TYPES.VariableDeclarator: {
       return parameterName(parameter.id)
@@ -85,7 +89,7 @@ function objectLiteralElementName(
       return fallback
 
     case AST_NODE_TYPES.Property:
-      return properyNameName(element.key, fallback)
+      return propertyName(element.key, fallback)
 
     // Don't support nested names for now
     // case AST_NODE_TYPES.RestElement:
@@ -97,7 +101,7 @@ function objectLiteralElementName(
   }
 }
 
-function properyNameName(key: PropertyName, fallback = '<unknown>'): string {
+function propertyName(key: PropertyName, fallback = '<unknown>'): string {
   switch (key.type) {
     case AST_NODE_TYPES.Identifier:
       return key.name
@@ -109,7 +113,7 @@ function properyNameName(key: PropertyName, fallback = '<unknown>'): string {
       // case AST_NODE_TYPES.SpreadElement:
       return fallback
     case AST_NODE_TYPES.MemberExpression:
-      return properyNameName(key.property, fallback)
+      return propertyName(key.property, fallback)
     case AST_NODE_TYPES.ArrowFunctionExpression:
     case AST_NODE_TYPES.AssignmentExpression:
     case AST_NODE_TYPES.BinaryExpression:

test/fixtures/freelancer-rates/exemplar/.meta/exemplar.js

@@ -25,43 +25,36 @@
  * @param {number} ratePerHour
  * @returns {number} the rate per day
  */
-export function dayRate(ratePerHour) {
+ export function dayRate(ratePerHour) {
   return ratePerHour * 8;
 }
 
-/**
- * Calculates the rate per month
- *
- * @param {number} ratePerHour
- * @param {number} discount for example 20% written as 0.2
- * @returns {number} the rounded up monthly rate
- */
-export function monthRate(ratePerHour, discount) {
-  const monthly = dayRate(ratePerHour) * 22;
-  const discounted = applyDiscount(monthly, discount);
-  return Math.ceil(discounted);
-}
-
 /**
  * Calculates the number of days in a budget, rounded down
  *
  * @param {number} budget the total budget
  * @param {number} ratePerHour the rate per hour
- * @param {number} discount to apply, example 20% written as 0.2
  * @returns {number} the number of days
  */
-export function daysInBudget(budget, ratePerHour, discount) {
-  const discounted = applyDiscount(dayRate(ratePerHour), discount);
-  return Math.floor(budget / discounted);
+export function daysInBudget(budget, ratePerHour) {
+  return Math.floor(budget / dayRate(ratePerHour));
 }
 
 /**
- * Applies a discount to the value
+ * Calculates the discounted rate for large projects, rounded up
  *
- * @param {number} value
- * @param {number} percentage for example 20% written as 0.2
- * @returns {number} the discounted value
+ * @param {number} ratePerHour
+ * @param {number} numDays: number of days the project spans
+ * @param {number} discount: for example 20% written as 0.2
+ * @returns {number} the discounted rate, rounded up
  */
-function applyDiscount(value, percentage) {
-  return (1 - percentage) * value;
-}
+export function priceWithMonthlyDiscount(ratePerHour, numDays, discount) {
+  const numMonths = Math.floor(numDays / 22);
+  const monthlyRate = 22 * dayRate(ratePerHour);
+  const monthlyDiscountedRate = (1 - discount) * monthlyRate;
+
+  const numExtraDays = numDays % 22;
+  const priceExtraDays = numExtraDays * dayRate(ratePerHour);
+
+  return Math.ceil(numMonths * monthlyDiscountedRate + priceExtraDays);
+}

test/fixtures/freelancer-rates/exemplar/freelancer-rates.js

@@ -25,43 +25,36 @@
  * @param {number} ratePerHour
  * @returns {number} the rate per day
  */
-export function dayRate(ratePerHour) {
+ export function dayRate(ratePerHour) {
   return ratePerHour * 8;
 }
 
-/**
- * Calculates the rate per month
- *
- * @param {number} ratePerHour
- * @param {number} discount for example 20% written as 0.2
- * @returns {number} the rounded up monthly rate
- */
-export function monthRate(ratePerHour, discount) {
-  const monthly = dayRate(ratePerHour) * 22;
-  const discounted = applyDiscount(monthly, discount);
-  return Math.ceil(discounted);
-}
-
 /**
  * Calculates the number of days in a budget, rounded down
  *
  * @param {number} budget the total budget
  * @param {number} ratePerHour the rate per hour
- * @param {number} discount to apply, example 20% written as 0.2
  * @returns {number} the number of days
  */
-export function daysInBudget(budget, ratePerHour, discount) {
-  const discounted = applyDiscount(dayRate(ratePerHour), discount);
-  return Math.floor(budget / discounted);
+export function daysInBudget(budget, ratePerHour) {
+  return Math.floor(budget / dayRate(ratePerHour));
 }
 
 /**
- * Applies a discount to the value
+ * Calculates the discounted rate for large projects, rounded up
  *
- * @param {number} value
- * @param {number} percentage for example 20% written as 0.2
- * @returns {number} the discounted value
+ * @param {number} ratePerHour
+ * @param {number} numDays: number of days the project spans
+ * @param {number} discount: for example 20% written as 0.2
+ * @returns {number} the discounted rate, rounded up
  */
-function applyDiscount(value, percentage) {
-  return (1 - percentage) * value;
-}
+export function priceWithMonthlyDiscount(ratePerHour, numDays, discount) {
+  const numMonths = Math.floor(numDays / 22);
+  const monthlyRate = 22 * dayRate(ratePerHour);
+  const monthlyDiscountedRate = (1 - discount) * monthlyRate;
+
+  const numExtraDays = numDays % 22;
+  const priceExtraDays = numExtraDays * dayRate(ratePerHour);
+
+  return Math.ceil(numMonths * monthlyDiscountedRate + priceExtraDays);
+}