Add New York rules (#30)

package.json

@@ -41,6 +41,7 @@
 	},
 	"type": "module",
 	"dependencies": {
+		"kolorist": "^1.8.0",
 		"remix-params-helper": "^0.4.10",
 		"zod": "^3.21.0"
 	}

src/app.html

@@ -15,7 +15,6 @@
 		<link rel="manifest" href="/manifest.webmanifest" />
 		<meta name="msapplication-TileColor" content="#1f2937" />
 		<meta name="theme-color" content="#1f2937" />
-		<link rel="script" src="/registerSW.js" />
 
 		%sveltekit.head%
 	</head>

src/lib/CheckSituation.svelte

@@ -25,7 +25,10 @@
 		situation={{ situation: params.situation, requestRequired: false }}
 		showIcon={false}
 	/>. The company is based in {localeName(params.companyLocation)}{#if params.employeeInLocation},
-		and already has employees in your location{/if}. The company has at least {params.totalEmployees}
+		and already has employees in your location{/if}. {#if params.officeSupervisorLocation !== OTHER_LOCALE}The
+		role reports to an office or non-remote supervisor in {localeName(
+			params.officeSupervisorLocation
+		)}.{/if} The company has at least {params.totalEmployees}
 	employee{#if params.totalEmployees !== 1}s{/if}. {#if params.roleLocation.length}The role can hire
 		in {#each params.roleLocation as roleLocation, i (roleLocation)}
 			{localeName(roleLocation)}{#if i < params.roleLocation.length - 1}, {#if i === params.roleLocation.length - 2}and

src/lib/checking.ts

@@ -25,6 +25,10 @@ export const Params = z.object({
 		.string()
 		.default('')
 		.refine((s) => Object.keys(locales).includes(s) || s === '' || s === OTHER_LOCALE),
+	officeSupervisorLocation: z
+		.string()
+		.default('')
+		.refine((s) => Object.keys(locales).includes(s) || s === '' || s === OTHER_LOCALE),
 	employeeInLocation: z.boolean().default(false),
 	// This circumlocution avoids an issue with how Zod handles
 	// some input values, resulting in a parse failure if the user deletes the content of the field.
@@ -60,6 +64,7 @@ export function isValidParams(params: MatchParameters): boolean {
 			params.userLocation &&
 			(params.roleLocation.length > 0 || params.situation === Situation.Employed) &&
 			params.companyLocation &&
+			params.officeSupervisorLocation &&
 			params.totalEmployees
 	);
 }
@@ -111,6 +116,15 @@ export function findMatchingLaws(
 						l.isOrContains(availableLocales[params.userLocation])
 				  )
 				: [];
+		// And same rubric for supervisor/office locales.
+		const supervisorOfficeLocales =
+			params.officeSupervisorLocation !== OTHER_LOCALE
+				? Object.values(availableLocales).filter(
+						(l) =>
+							l.who.officeSupervisorInLocale &&
+							l.isOrContains(availableLocales[params.officeSupervisorLocation])
+				  )
+				: [];
 
 		for (const thisLocale of Object.values(availableLocales)) {
 			const disclosureSituations = thisLocale.when.map((s) => s.situation).sort();
@@ -122,7 +136,15 @@ export function findMatchingLaws(
 				params.roleLocation.filter((eachLocale) =>
 					availableAllLocales[eachLocale].isOrContains(thisLocale)
 				).length > 0;
-			if (!isEligibleHireLocale && params.situation !== Situation.Employed) continue;
+			const isRelevantSupervisorLocale = supervisorOfficeLocales
+				.map((u) => thisLocale.isOrContains(u))
+				.some((f) => f);
+			if (
+				!isEligibleHireLocale &&
+				params.situation !== Situation.Employed &&
+				!isRelevantSupervisorLocale
+			)
+				continue;
 
 			// Would this locale's "when" rules apply to the user's situation?
 			const situationMatch =
@@ -135,11 +157,12 @@ export function findMatchingLaws(
 				!thisLocale.who.minEmployees || thisLocale.who.minEmployees <= params.totalEmployees;
 
 			if (situationMatch && totalEmployeeCountMatch) {
-				// Is this locality the same as or inside either the user's location or the company's?
+				// Is this locality the same as or encloses either the user's location or the company's?
 				// (A geographic match makes the fit easier to evaluate).
 				const geographicMatch = Boolean(
-					companyLocales.map((c) => c.isOrContains(thisLocale)).some((f) => f) ||
-						(userLocales.map((u) => u.isOrContains(thisLocale)).some((f) => f) &&
+					companyLocales.map((c) => thisLocale.isOrContains(c)).some((f) => f) ||
+						isRelevantSupervisorLocale ||
+						(userLocales.map((u) => thisLocale.isOrContains(u)).some((f) => f) &&
 							(thisLocale.who.minEmployeesInLocale || 0 <= 1) &&
 							(params.employeeInLocation || params.situation === Situation.Employed))
 				);

src/lib/data.ts

@@ -101,6 +101,7 @@ export class Locale implements AbstractLocale {
 interface WhoDisclosure {
 	officeInLocale?: boolean;
 	canHireInLocale?: boolean;
+	officeSupervisorInLocale?: boolean;
 	minEmployees?: number;
 	minEmployeesInLocale?: number;
 }
@@ -372,6 +373,25 @@ const locales: Record<string, Locale> = [
 		},
 		legalUrl: 'https://codelibrary.amlegal.com/codes/toledo/latest/toledo_oh/0-0-0-159338',
 		reportViolationProcess: 'a private cause of action; no enforcement is done by the city'
+	}),
+	new Locale({
+		state: 'New York',
+		stateCode: 'NY',
+		strength: Strength.Strong,
+		what: {
+			salary: true
+		},
+		when: [{ situation: Situation.Interested }],
+		who: {
+			minEmployees: 4,
+			canHireInLocale: true,
+			officeSupervisorInLocale: true
+		},
+		referenceSource: 'New York Department of Labor',
+		referenceUrl: 'https://dol.ny.gov/pay-transparency',
+		reportViolationProcess: '',
+		reportViolationUrl: 'https://dol.ny.gov/pay-transparency',
+		legalUrl: 'https://www.nysenate.gov/legislation/bills/2023/S1326'
 	})
 ].reduce((map, locale) => {
 	map[locale.id] = locale;

src/routes/find-your-rights/+page.svelte

@@ -112,6 +112,22 @@
 					{/each}
 				</select>
 			</label>
+			<label class="block" for="officeSupervisorLocation"
+				>Where is your office or non-remote supervisor located?
+				<aside class="italic text-xs">
+					If you don't know, or if your supervisor works remotely, choose "Somewhere else".
+				</aside>
+				<select
+					bind:value={$pageParams.officeSupervisorLocation}
+					id="officeSupervisorLocation"
+					class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-300 focus:ring focus:ring-zinc-200 focus:ring-opacity-50"
+				>
+					{#each myLocationOptions as locale (locale[0])}
+						<option value={locale[0]}>{locale[1]}</option>
+					{/each}
+				</select>
+			</label>
+
 			<label class="block" for="totalEmployees">
 				How many total employees does the employer have?
 				<aside class="text-xs italic">

src/routes/locations/[slug]/+page.svelte

@@ -39,11 +39,19 @@
 			<br /><span class="italic text-xs"
 				>Note that this criterion is often poorly defined by the locale.</span
 			>
-		</li>{/if}
+		</li>
+	{/if}
 	{#if data.locale.who.canHireInLocale}
 		<li>
 			the role <strong>can be hired in {data.locale.name}</strong> (including remote);
-		</li>{/if}
+		</li>
+	{/if}
+	{#if data.locale.who.officeSupervisorInLocale}
+		<li>
+			the position is outside {data.locale.name}, but
+			<strong>reports to an office or non-remote supervisor located in {data.locale.name}; </strong>
+		</li>
+	{/if}
 </ul>
 <p>The employer must disclose:</p>
 <ul class="pb-2 indent">

src/tests/checking.test.ts

@@ -100,6 +100,18 @@ const locales: Record<string, Locale> = [
 			minEmployeesInLocale: 15,
 			officeInLocale: true
 		}
+	}),
+	new Locale({
+		state: 'New York',
+		stateCode: 'NY',
+		strength: Strength.Strong,
+		what: {
+			salary: true
+		},
+		when: [{ situation: Situation.Interested }],
+		who: {
+			officeSupervisorInLocale: true
+		}
 	})
 ].reduce((map, locale) => {
 	map[locale.id] = locale;
@@ -161,6 +173,7 @@ describe('validating parameters', () => {
 					situation: 1,
 					userLocation: 'california',
 					companyLocation: 'colorado',
+					officeSupervisorLocation: 'other',
 					employeeInLocation: true,
 					totalEmployees: 50,
 					roleLocation: 'california,colorado'
@@ -180,6 +193,7 @@ describe('validating parameters', () => {
 					situation: 1,
 					userLocation: 'california',
 					companyLocation: 'colorado',
+					officeSupervisorLocation: 'other',
 					employeeInLocation: true,
 					totalEmployees: 50
 				})
@@ -194,6 +208,7 @@ describe('matches simple laws', () => {
 			situation: Situation.Interested,
 			userLocation: 'california',
 			companyLocation: 'colorado',
+			officeSupervisorLocation: 'other',
 			employeeInLocation: true,
 			totalEmployees: 50,
 			roleLocation: ['california', 'colorado', 'washington', 'nevada']
@@ -240,6 +255,7 @@ describe('matches with placeholder role location', () => {
 			situation: Situation.Interested,
 			userLocation: 'california',
 			companyLocation: 'colorado',
+			officeSupervisorLocation: 'other',
 			employeeInLocation: true,
 			totalEmployees: 50,
 			roleLocation: ['us', 'other']
@@ -290,6 +306,7 @@ describe('matches with placeholder user location', () => {
 			situation: Situation.Interested,
 			userLocation: 'other',
 			companyLocation: 'colorado',
+			officeSupervisorLocation: 'other',
 			employeeInLocation: false,
 			totalEmployees: 50,
 			roleLocation: ['us', 'other']
@@ -316,6 +333,7 @@ describe('matches with sub-locations', () => {
 				situation: Situation.Interview,
 				userLocation: 'other',
 				companyLocation: 'nevada-goodsprings',
+				officeSupervisorLocation: 'other',
 				employeeInLocation: true,
 				totalEmployees: 50,
 				roleLocation: ['nevada']
@@ -346,6 +364,7 @@ describe('matches with sub-locations', () => {
 				situation: Situation.Interview,
 				userLocation: 'nevada-goodsprings',
 				companyLocation: 'california',
+				officeSupervisorLocation: 'other',
 				employeeInLocation: true,
 				totalEmployees: 50,
 				roleLocation: ['us']
@@ -378,6 +397,7 @@ describe('handles different situation thresholds', () => {
 				situation: Situation.Employed,
 				userLocation: 'colorado',
 				companyLocation: 'california',
+				officeSupervisorLocation: 'other',
 				employeeInLocation: false,
 				totalEmployees: 50,
 				roleLocation: ['us']
@@ -402,6 +422,7 @@ describe('handles different situation thresholds', () => {
 				situation: Situation.Employed,
 				userLocation: 'california',
 				companyLocation: 'colorado',
+				officeSupervisorLocation: 'other',
 				employeeInLocation: false,
 				totalEmployees: 50,
 				roleLocation: ['us']
@@ -426,6 +447,7 @@ describe('handles different situation thresholds', () => {
 				situation: Situation.Offer,
 				userLocation: 'other',
 				companyLocation: 'ohio-toledo',
+				officeSupervisorLocation: 'other',
 				employeeInLocation: false,
 				totalEmployees: 50,
 				roleLocation: ['us']
@@ -443,3 +465,28 @@ describe('handles different situation thresholds', () => {
 		});
 	});
 });
+
+it("handles New York's supervisor-location rubric", () => {
+	const matches = findMatchingLaws(
+		{
+			situation: Situation.Interested,
+			userLocation: 'other',
+			companyLocation: 'california',
+			officeSupervisorLocation: 'new-york',
+			employeeInLocation: false,
+			totalEmployees: 50,
+			roleLocation: ['california']
+		},
+		locales,
+		allLocales
+	);
+
+	expect(matches.length).toEqual(2);
+	expect(matches).toContainEqual({
+		locale: locales['new-york'],
+		earliestDisclosurePoint: Situation.Interested,
+		minEmployeesInLocale: 0,
+		what: { salary: true },
+		isGeoMatch: true
+	});
+});

svelte.config.js

@@ -21,7 +21,10 @@ const config = {
 	],
 
 	kit: {
-		adapter: adapter()
+		adapter: adapter(),
+		serviceWorker: {
+			register: false
+		}
 	}
 };