@jskit-ai/users-core 0.1.20 → 0.1.22

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/users-core",
-  version: "0.1.20",
+  version: "0.1.22",
   description: "Users/workspace domain runtime plus HTTP routes for workspace, account, and console features.",
   dependsOn: [
     "@jskit-ai/auth-core",
@@ -206,7 +206,7 @@ export default Object.freeze({
         "@jskit-ai/auth-core": "0.1.15",
         "@jskit-ai/database-runtime": "0.1.16",
         "@jskit-ai/http-runtime": "0.1.15",
-        "@jskit-ai/kernel": "0.1.15",
+        "@jskit-ai/kernel": "0.1.16",
         "@fastify/multipart": "^9.4.0",
         "@fastify/type-provider-typebox": "^6.1.0",
         "typebox": "^1.0.81"
@@ -252,6 +252,15 @@ export default Object.freeze({
         category: "migration",
         id: "users-core-console-owner-schema"
       },
+      {
+        op: "install-migration",
+        from: "templates/migrations/users_core_workspace_settings_single_name_source.cjs",
+        toDir: "migrations",
+        extension: ".cjs",
+        reason: "Remove workspace_settings.name so workspace names come from workspaces only.",
+        category: "migration",
+        id: "users-core-workspace-settings-single-name-source"
+      },
       {
         from: "templates/packages/main/src/shared/resources/workspaceSettingsFields.js",
         to: "packages/main/src/shared/resources/workspaceSettingsFields.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/users-core",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -27,7 +27,7 @@
     "@jskit-ai/auth-core": "0.1.15",
     "@jskit-ai/database-runtime": "0.1.16",
     "@jskit-ai/http-runtime": "0.1.15",
-    "@jskit-ai/kernel": "0.1.15",
+    "@jskit-ai/kernel": "0.1.16",
     "@fastify/multipart": "^9.4.0",
     "@fastify/type-provider-typebox": "^6.1.0",
     "typebox": "^1.0.81"

package/src/server/common/repositories/workspacesRepository.js

@@ -49,7 +49,7 @@ function createRepository(knex) {
     const columns = [
       "w.id",
       "w.slug",
-      client.raw("COALESCE(ws.name, w.name) as name"),
+      "w.name",
       "w.owner_user_id",
       "w.is_personal",
       client.raw("COALESCE(ws.avatar_url, w.avatar_url) as avatar_url"),

package/src/shared/support/usersApiPaths.js

@@ -1,11 +1,16 @@
 import { normalizePathname } from "@jskit-ai/kernel/shared/surface/paths";
+import { splitPathQueryAndHash } from "@jskit-ai/kernel/shared/support";
 
 const USERS_PUBLIC_API_BASE_PATH = "/api";
 const USERS_WORKSPACE_API_BASE_PATH = "/api/w/:workspaceSlug/workspace";
 
 function normalizeApiRelativePath(relativePath = "/") {
-  const normalizedPath = normalizePathname(relativePath);
-  return normalizedPath || "/";
+  const { pathname, queryString, hash } = splitPathQueryAndHash(relativePath);
+  const normalizedPath = normalizePathname(pathname || "/") || "/";
+  const normalizedQueryString = String(queryString || "").trim().replace(/^\?+/, "");
+  const normalizedHash = String(hash || "").trim();
+  const querySuffix = normalizedQueryString ? `?${normalizedQueryString}` : "";
+  return `${normalizedPath}${querySuffix}${normalizedHash}`;
 }
 
 function normalizeSurfaceWorkspaceRequirement(value = false) {
@@ -22,6 +27,10 @@ function resolveApiBasePath({ surfaceRequiresWorkspace = false, relativePath = "
     return basePath;
   }
 
+  if (normalizedRelativePath.startsWith("/?") || normalizedRelativePath.startsWith("/#")) {
+    return `${basePath}${normalizedRelativePath.slice(1)}`;
+  }
+
   return `${basePath}${normalizedRelativePath}`;
 }
 

package/templates/migrations/users_core_initial.cjs

@@ -44,7 +44,6 @@ exports.up = async function up(knex) {
 
   await knex.schema.createTable("workspace_settings", (table) => {
     table.integer("workspace_id").unsigned().primary().references("id").inTable("workspaces").onDelete("CASCADE");
-    table.string("name", 160).notNullable().defaultTo("Workspace");
     table.string("avatar_url", 512).notNullable().defaultTo("");
     table.string("light_primary_color", 7).notNullable().defaultTo("#1867C0");
     table.string("light_secondary_color", 7).notNullable().defaultTo("#48A9A6");

package/templates/migrations/users_core_workspace_settings_single_name_source.cjs

@@ -0,0 +1,54 @@
+const WORKSPACE_SETTINGS_TABLE = "workspace_settings";
+const WORKSPACES_TABLE = "workspaces";
+const LEGACY_NAME_COLUMN = "name";
+
+async function hasTable(knex, tableName) {
+  return knex.schema.hasTable(tableName);
+}
+
+async function hasColumn(knex, tableName, columnName) {
+  return knex.schema.hasColumn(tableName, columnName);
+}
+
+exports.up = async function up(knex) {
+  const hasWorkspaceSettings = await hasTable(knex, WORKSPACE_SETTINGS_TABLE);
+  if (!hasWorkspaceSettings) {
+    return;
+  }
+
+  const hasLegacyName = await hasColumn(knex, WORKSPACE_SETTINGS_TABLE, LEGACY_NAME_COLUMN);
+  if (!hasLegacyName) {
+    return;
+  }
+
+  await knex.schema.alterTable(WORKSPACE_SETTINGS_TABLE, (table) => {
+    table.dropColumn(LEGACY_NAME_COLUMN);
+  });
+};
+
+exports.down = async function down(knex) {
+  const hasWorkspaceSettings = await hasTable(knex, WORKSPACE_SETTINGS_TABLE);
+  if (!hasWorkspaceSettings) {
+    return;
+  }
+
+  const hasLegacyName = await hasColumn(knex, WORKSPACE_SETTINGS_TABLE, LEGACY_NAME_COLUMN);
+  if (!hasLegacyName) {
+    await knex.schema.alterTable(WORKSPACE_SETTINGS_TABLE, (table) => {
+      table.string(LEGACY_NAME_COLUMN, 160).notNullable().defaultTo("Workspace");
+    });
+  }
+
+  const hasWorkspaces = await hasTable(knex, WORKSPACES_TABLE);
+  if (!hasWorkspaces) {
+    return;
+  }
+
+  const workspaceRows = await knex(WORKSPACES_TABLE).select("id", "name");
+  for (const workspaceRow of workspaceRows) {
+    const normalizedName = String(workspaceRow?.name || "").trim() || "Workspace";
+    await knex(WORKSPACE_SETTINGS_TABLE)
+      .where({ workspace_id: Number(workspaceRow.id) })
+      .update({ name: normalizedName });
+  }
+};

package/templates/packages/main/src/shared/resources/workspaceSettingsFields.js

@@ -35,26 +35,6 @@ function normalizeHexColor(value) {
 
 resetWorkspaceSettingsFields();
 
-defineField({
-  key: "name",
-  dbColumn: "name",
-  required: true,
-  inputSchema: Type.String({
-    minLength: 1,
-    maxLength: 160,
-    messages: {
-      required: "Workspace name is required.",
-      minLength: "Workspace name is required.",
-      maxLength: "Workspace name must be at most 160 characters.",
-      default: "Workspace name is required."
-    }
-  }),
-  outputSchema: Type.String({ minLength: 1, maxLength: 160 }),
-  normalizeInput: (value) => normalizeText(value),
-  normalizeOutput: (value) => normalizeText(value),
-  resolveDefault: ({ workspace = {} } = {}) => normalizeText(workspace.name) || "Workspace"
-});
-
 defineField({
   key: "avatarUrl",
   dbColumn: "avatar_url",

package/test/usersApiPaths.test.js

@@ -29,3 +29,21 @@ test("resolveApiBasePath resolves workspace and non-workspace API base paths", (
     "/api/customers"
   );
 });
+
+test("resolveApiBasePath preserves query strings and hash fragments", () => {
+  assert.equal(
+    resolveApiBasePath({
+      surfaceRequiresWorkspace: true,
+      relativePath: "/customers?search=buddy#top"
+    }),
+    "/api/w/:workspaceSlug/workspace/customers?search=buddy#top"
+  );
+
+  assert.equal(
+    resolveApiBasePath({
+      surfaceRequiresWorkspace: false,
+      relativePath: "/?cursor=2"
+    }),
+    "/api?cursor=2"
+  );
+});

package/test/usersRouteRequestInputValidator.test.js

@@ -404,7 +404,7 @@ test("workspace settings route handlers build action input from request.input",
     createActionRequest({
       input: {
         params: { workspaceSlug: "acme" },
-        body: { name: "Acme Workspace" }
+        body: { avatarUrl: "https://example.com/acme.png" }
       },
       executeAction
     }),
@@ -413,7 +413,7 @@ test("workspace settings route handlers build action input from request.input",
 
   assert.deepEqual(calls[0], {
     actionId: "workspace.settings.update",
-    input: { workspaceSlug: "acme", patch: { name: "Acme Workspace" } }
+    input: { workspaceSlug: "acme", patch: { avatarUrl: "https://example.com/acme.png" } }
   });
 });
 

package/test/workspaceSettingsRepository.test.js

@@ -16,7 +16,6 @@ function createKnexStub(rowOverrides = {}) {
     updatePayload: null,
     row: {
       workspace_id: 1,
-      name: "Workspace",
       avatar_url: "",
       light_primary_color: DEFAULT_WORKSPACE_THEME.light.color,
       light_secondary_color: DEFAULT_WORKSPACE_THEME.light.secondaryColor,
@@ -41,7 +40,6 @@ function createKnexStub(rowOverrides = {}) {
         state.insertedRow = { ...payload };
         state.row = {
           workspace_id: payload.workspace_id,
-          name: payload.name,
           avatar_url: payload.avatar_url,
           light_primary_color: payload.light_primary_color,
           light_secondary_color: payload.light_secondary_color,
@@ -69,9 +67,6 @@ function createKnexStub(rowOverrides = {}) {
             if (Object.hasOwn(payload, "invites_enabled")) {
               state.row.invites_enabled = payload.invites_enabled;
             }
-            if (Object.hasOwn(payload, "name")) {
-              state.row.name = payload.name;
-            }
             if (Object.hasOwn(payload, "avatar_url")) {
               state.row.avatar_url = payload.avatar_url;
             }
@@ -122,7 +117,6 @@ test("workspaceSettingsRepository.findByWorkspaceId maps the stored row", async
 
   assert.deepEqual(record, {
     workspaceId: 1,
-    name: "Workspace",
     avatarUrl: "",
     lightPrimaryColor: DEFAULT_WORKSPACE_THEME.light.color,
     lightSecondaryColor: DEFAULT_WORKSPACE_THEME.light.secondaryColor,
@@ -162,7 +156,6 @@ test("workspaceSettingsRepository.ensureForWorkspaceId inserts the injected defa
   const record = await repository.ensureForWorkspaceId(5);
 
   assert.equal(state.insertedRow.workspace_id, 5);
-  assert.equal(state.insertedRow.name, "Workspace");
   assert.equal(state.insertedRow.avatar_url, "");
   assert.equal(state.insertedRow.light_primary_color, DEFAULT_WORKSPACE_THEME.light.color);
   assert.equal(state.insertedRow.light_secondary_color, DEFAULT_WORKSPACE_THEME.light.secondaryColor);
@@ -179,7 +172,6 @@ test("workspaceSettingsRepository.ensureForWorkspaceId inserts the injected defa
     DEFAULT_WORKSPACE_THEME.dark.surfaceVariantColor
   );
   assert.equal(state.insertedRow.invites_enabled, false);
-  assert.equal(record.name, "Workspace");
   assert.equal(record.avatarUrl, "");
   assert.equal(record.lightPrimaryColor, DEFAULT_WORKSPACE_THEME.light.color);
   assert.equal(record.lightSecondaryColor, DEFAULT_WORKSPACE_THEME.light.secondaryColor);
@@ -192,22 +184,19 @@ test("workspaceSettingsRepository.ensureForWorkspaceId inserts the injected defa
   assert.equal(record.invitesEnabled, false);
 });
 
-test("workspaceSettingsRepository.updateSettingsByWorkspaceId updates name/avatar/color columns", async () => {
+test("workspaceSettingsRepository.updateSettingsByWorkspaceId updates avatar/color columns", async () => {
   const { knexStub, state } = createKnexStub();
   const repository = createRepository(knexStub, {
     defaultInvitesEnabled: true
   });
 
   const updated = await repository.updateSettingsByWorkspaceId(1, {
-    name: "New name",
     avatarUrl: "https://example.com/avatar.png",
     lightPrimaryColor: "#123abc"
   });
 
-  assert.equal(state.updatePayload.name, "New name");
   assert.equal(state.updatePayload.avatar_url, "https://example.com/avatar.png");
   assert.equal(state.updatePayload.light_primary_color, "#123ABC");
-  assert.equal(updated.name, "New name");
   assert.equal(updated.avatarUrl, "https://example.com/avatar.png");
   assert.equal(updated.lightPrimaryColor, "#123ABC");
 });

package/test/workspaceSettingsResource.test.js

@@ -46,7 +46,6 @@ function parseBody(operation, payload = {}) {
 
 test("workspace settings patch body normalizes valid payload before validation", () => {
   const parsed = parseBody(workspaceSettingsResource.operations.patch, {
-    name: "  Team Mercury  ",
     avatarUrl: "https://example.com/avatar.png",
     lightPrimaryColor: "#0f6b54",
     lightSecondaryColor: "#0b4d3c",
@@ -62,7 +61,6 @@ test("workspace settings patch body normalizes valid payload before validation",
   assert.equal(parsed.ok, true);
   assert.deepEqual(parsed.fieldErrors, {});
   assert.deepEqual(parsed.value, {
-    name: "Team Mercury",
     avatarUrl: "https://example.com/avatar.png",
     lightPrimaryColor: "#0F6B54",
     lightSecondaryColor: "#0B4D3C",
@@ -88,19 +86,8 @@ test("workspace settings patch body validates avatar URL protocol", () => {
   );
 });
 
-test("workspace settings patch body keeps max-length name rule", () => {
-  const parsed = parseBody(workspaceSettingsResource.operations.patch, {
-    name: "x".repeat(161)
-  });
-
-  assert.equal(parsed.ok, false);
-  assert.equal(parsed.fieldErrors.name, "Workspace name must be at most 160 characters.");
-});
-
 test("workspace settings create body requires full-write fields", () => {
-  const parsed = parseBody(workspaceSettingsResource.operations.create, {
-    name: "Mercury Workspace"
-  });
+  const parsed = parseBody(workspaceSettingsResource.operations.create, {});
 
   assert.equal(parsed.ok, false);
   assert.equal(parsed.fieldErrors.lightPrimaryColor, "Light primary color is required.");
@@ -125,7 +112,6 @@ test("workspace settings output normalizes raw service payloads", () => {
       ownerUserId: "9"
     },
     settings: {
-      name: "  Mercury Workspace  ",
       avatarUrl: "  https://example.com/avatar.png  ",
       lightPrimaryColor: "#0f6b54",
       invitesEnabled: false
@@ -140,7 +126,6 @@ test("workspace settings output normalizes raw service payloads", () => {
       ownerUserId: 9
     },
     settings: {
-      name: "Mercury Workspace",
       avatarUrl: "https://example.com/avatar.png",
       lightPrimaryColor: "#0F6B54",
       lightSecondaryColor: expectedTheme.light.secondaryColor,

package/test/workspaceSettingsService.test.js

@@ -30,7 +30,6 @@ function createFixture({ workspaceInvitationsEnabled = true } = {}) {
       color: defaultTheme.light.color
     },
     settings: {
-      name: "TonyMobily3",
       avatarUrl: "",
       lightPrimaryColor: defaultTheme.light.color,
       lightSecondaryColor: defaultTheme.light.secondaryColor,
@@ -75,7 +74,6 @@ test("workspaceSettingsService.getWorkspaceSettings returns the stored invitesEn
   );
 
   assert.deepEqual(response.settings, {
-    name: "TonyMobily3",
     avatarUrl: "",
     lightPrimaryColor: "#0F6B54",
     lightSecondaryColor: "#48A9A6",
@@ -97,18 +95,15 @@ test("workspaceSettingsService.updateWorkspaceSettings writes editable fields th
   const response = await service.updateWorkspaceSettings(
     state.workspace,
     {
-      name: "New Name",
       invitesEnabled: false
     },
     authorizedOptions(["workspace.settings.update"])
   );
 
   assert.deepEqual(state.settingsPatch, {
-    name: "New Name",
     invitesEnabled: false
   });
   assert.deepEqual(response.settings, {
-    name: "New Name",
     avatarUrl: "",
     lightPrimaryColor: "#0F6B54",
     lightSecondaryColor: "#48A9A6",
@@ -135,7 +130,6 @@ test("workspaceSettingsService disables invite settings in output when app polic
   );
 
   assert.deepEqual(response.settings, {
-    name: "TonyMobily3",
     avatarUrl: "",
     lightPrimaryColor: "#0F6B54",
     lightSecondaryColor: "#48A9A6",