placementt-core 1.400.1171 → 1.400.1174

package/.github/workflows/publish.yaml

@@ -4,7 +4,12 @@ on:
   push:
     branches:
       - main
-permissions: 
+# Every publish rewrites the same npm package document, so two runs publishing at
+# once clobber each other's versions and dist-tags. Queue runs instead.
+concurrency:
+  group: npm-publish
+  cancel-in-progress: false
+permissions:
   contents: write          # default for repo checkout
   id-token: write         # <-- required for npm provenance
 jobs:
@@ -12,6 +17,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          # A queued run must build the tip of main (including the previous run's
+          # version bump), not the commit that originally triggered it.
+          ref: main
 
       - name: Setup Node
         uses: actions/setup-node@v4

package/deploy-all.js

@@ -11,7 +11,11 @@ console.log("📦 Starting automated deploy-all process...");
 const packageJsonPath = 'package.json';
 const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
 
-const [major, minor, patch] = packageJson.version.split('.').map(Number);
+// package.json can lag the registry (a bump commit that failed to push, or a
+// manual edit), so take the highest patch from either source.
+const publishedTags = JSON.parse(execSync('npm view placementt-core dist-tags --json', { encoding: 'utf8' }));
+const patchOf = (version) => Number(version.split('.')[2]);
+const patch = Math.max(patchOf(packageJson.version), ...['prod', 'dev', 'emu'].filter((tag) => publishedTags[tag]).map((tag) => patchOf(publishedTags[tag])));
 const nextPatch = patch + 1;
 
 console.log(`🔍 Current version: ${packageJson.version}`);
@@ -23,6 +27,26 @@ function updateVersion(version) {
   console.log(`✅ Updated version to ${version}`);
 }
 
+// npm processes publishes asynchronously, and a publish that lands while the
+// previous one is still being processed can overwrite that one's dist-tag (the
+// version itself survives). Wait for each publish to settle before the next —
+// the first publish of a run regularly takes 5+ minutes to become visible.
+function publishAndWait(version, tag) {
+  run(`npm publish --tag ${tag}`);
+
+  for (let attempt = 0; attempt < 180; attempt++) {
+    const tags = JSON.parse(execSync('npm view placementt-core dist-tags --json --prefer-online', { encoding: 'utf8' }));
+    if (tags[tag] === version) {
+      console.log(`✅ ${tag} → ${version}`);
+      return;
+    }
+    execSync('sleep 5');
+  }
+
+  console.error(`❌ ${tag} still not pointing at ${version} after 15 minutes. Fix with: npm dist-tag add placementt-core@${version} ${tag}`);
+  process.exit(1);
+}
+
 // ---- Keep original file contents for reset ----
 const firebaseConfigPath = 'src/firebase/firebaseConfig.tsx';
 // Every Algolia client reads the app id from this one module, so swapping it
@@ -45,20 +69,10 @@ function toDevAlgoliaConfig(source) {
   return swapped;
 }
 
-// -------------------------------
-// 1️⃣ PROD VERSION
-// -------------------------------
 const prodVersion = `1.1.${nextPatch}`;
-updateVersion(prodVersion);
-
-console.log("🚀 Building (prod)...");
-run('yarn tsc');
-
-console.log(`📤 Publishing ${prodVersion}`);
-run('npm publish --tag prod');
 
 // -------------------------------
-// 2️⃣ DEV VERSION
+// 1️⃣ DEV VERSION
 // -------------------------------
 console.log("🛠 Switching to DEV config...");
 
@@ -77,10 +91,10 @@ console.log("🚀 Building (dev)...");
 run('yarn tsc');
 
 console.log(`📤 Publishing ${devVersion}`);
-run('npm publish --tag dev');
+publishAndWait(devVersion, 'dev');
 
 // -------------------------------
-// 3️⃣ EMULATOR VERSION
+// 2️⃣ EMULATOR VERSION
 // -------------------------------
 console.log("🛠 Switching to EMULATOR config...");
 
@@ -97,7 +111,7 @@ console.log("🚀 Building (emulator)...");
 run('yarn tsc');
 
 console.log(`📤 Publishing ${emulatorVersion}`);
-run('npm publish --tag emu');
+publishAndWait(emulatorVersion, 'emu');
 
 // -------------------------------
 // RESET FILES
@@ -106,6 +120,17 @@ console.log("🧹 Resetting source files...");
 fs.writeFileSync(firebaseConfigPath, originalFirebaseConfig);
 fs.writeFileSync(algoliaConfigPath, originalAlgoliaConfig);
 
+// -------------------------------
+// PROD VERSION (last, so nothing publishes after it and clobbers its tag)
+// -------------------------------
+updateVersion(prodVersion);
+
+console.log("🚀 Building (prod)...");
+run('yarn tsc');
+
+console.log(`📤 Publishing ${prodVersion}`);
+publishAndWait(prodVersion, 'prod');
+
 console.log("🎉 Deployment complete!");
 
 updateVersion(prodVersion);
@@ -114,6 +139,8 @@ execSync('git config user.email "github-actions@github.com"', { stdio: 'inherit'
 
 execSync('git add package.json', { stdio: 'inherit' });
 execSync('git commit -m "chore: bump version"', { stdio: 'inherit' });
+// main may have moved while this run was building; rebase so the bump still lands.
+execSync('git pull --rebase origin main', { stdio: 'inherit' });
 execSync('git push origin main', { stdio: 'inherit' });
 
 console.log("🎉 Deployment complete!");

package/lib/callables/events.d.ts

@@ -71,14 +71,17 @@ export declare const eventsCallables: {
             eventSchoolId: z.ZodString;
             slotIds: z.ZodArray<z.ZodString, "many">;
             students: z.ZodOptional<z.ZodNumber>;
+            studentsPerSlot: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodNumber>>;
         }, "strip", z.ZodTypeAny, {
             eventSchoolId: string;
             slotIds: string[];
             students?: number | undefined;
+            studentsPerSlot?: Record<string, number> | undefined;
         }, {
             eventSchoolId: string;
             slotIds: string[];
             students?: number | undefined;
+            studentsPerSlot?: Record<string, number> | undefined;
         }>;
         response: z.ZodObject<{
             code: z.ZodEnum<["booked"]>;

package/lib/callables/events.js

@@ -45,6 +45,8 @@ exports.eventsCallables = {
             eventSchoolId: zod_1.z.string().min(1),
             slotIds: zod_1.z.array(zod_1.z.string().min(1)).min(1),
             students: zod_1.z.number().int().min(1).optional(),
+            // Students per slot, when places are counted in students. Takes precedence over students.
+            studentsPerSlot: zod_1.z.record(zod_1.z.string(), zod_1.z.number().int().min(1)).optional(),
         }),
         response: zod_1.z.object({
             code: zod_1.z.enum(["booked"]),

package/lib/callables/events.js.map

@@ -1 +1 @@
-{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/callables/events.ts"],"names":[],"mappings":";;;AAAA,6BAAsB;AAGtB;;;GAGG;AACU,QAAA,eAAe,GAAG;IAC3B,qBAAqB,EAAE;QACnB,OAAO,EAAE,OAAC,CAAC,MAAM,CAAC;YACd,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;YACf,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;SACpB,CAAC;QACF,qEAAqE;QACrE,QAAQ,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,CAAC;YACvB,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;YACd,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAC3B,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAC9B,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YACtC,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YACtC,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAClC,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAC/B,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;SACjC,CAAC,CAAC;KACN;IACD,uEAAuE;IACvE,2EAA2E;IAC3E,6BAA6B,EAAE;QAC3B,OAAO,EAAE,OAAC,CAAC,MAAM,CAAC;YACd,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;YACtB,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1B,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;SAChC,CAAC;QACF,QAAQ,EAAE,OAAC,CAAC,MAAM,CAAC;YACf,IAAI,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;SACzC,CAAC;KACL;IACD,iFAAiF;IACjF,4EAA4E;IAC5E,2EAA2E;IAC3E,kBAAkB;IAClB,uBAAuB,EAAE;QACrB,OAAO,EAAE,OAAC,CAAC,MAAM,CAAC;YACd,aAAa,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;YAChC,OAAO,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1C,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;SAC/C,CAAC;QACF,QAAQ,EAAE,OAAC,CAAC,MAAM,CAAC;YACf,IAAI,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC;SAC3B,CAAC;KACL;IACD,yDAAyD;IACzD,+BAA+B,EAAE;QAC7B,OAAO,EAAE,OAAC,CAAC,MAAM,CAAC;YACd,aAAa,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;YAChC,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;SAC5B,CAAC;QACF,QAAQ,EAAE,OAAC,CAAC,MAAM,CAAC;YACf,IAAI,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC;SAC5B,CAAC;KACL;CACoB,CAAC"}
+{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/callables/events.ts"],"names":[],"mappings":"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"}

package/lib/callables/registry.d.ts

@@ -2408,14 +2408,17 @@ export declare const allCallables: {
             eventSchoolId: z.ZodString;
             slotIds: z.ZodArray<z.ZodString, "many">;
             students: z.ZodOptional<z.ZodNumber>;
+            studentsPerSlot: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodNumber>>;
         }, "strip", z.ZodTypeAny, {
             eventSchoolId: string;
             slotIds: string[];
             students?: number | undefined;
+            studentsPerSlot?: Record<string, number> | undefined;
         }, {
             eventSchoolId: string;
             slotIds: string[];
             students?: number | undefined;
+            studentsPerSlot?: Record<string, number> | undefined;
         }>;
         response: z.ZodObject<{
             code: z.ZodEnum<["booked"]>;
@@ -2626,14 +2629,17 @@ export declare const callableGroups: {
                 eventSchoolId: z.ZodString;
                 slotIds: z.ZodArray<z.ZodString, "many">;
                 students: z.ZodOptional<z.ZodNumber>;
+                studentsPerSlot: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodNumber>>;
             }, "strip", z.ZodTypeAny, {
                 eventSchoolId: string;
                 slotIds: string[];
                 students?: number | undefined;
+                studentsPerSlot?: Record<string, number> | undefined;
             }, {
                 eventSchoolId: string;
                 slotIds: string[];
                 students?: number | undefined;
+                studentsPerSlot?: Record<string, number> | undefined;
             }>;
             response: z.ZodObject<{
                 code: z.ZodEnum<["booked"]>;

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "placementt-core",
   "author": "Placementt",
-  "version": "1.400.1171",
+  "version": "1.400.1174",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {

package/src/callables/events.ts

@@ -44,6 +44,8 @@ export const eventsCallables = {
             eventSchoolId: z.string().min(1),
             slotIds: z.array(z.string().min(1)).min(1),
             students: z.number().int().min(1).optional(),
+            // Students per slot, when places are counted in students. Takes precedence over students.
+            studentsPerSlot: z.record(z.string(), z.number().int().min(1)).optional(),
         }),
         response: z.object({
             code: z.enum(["booked"]),