@wirechunk/cli 0.0.5 → 0.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wirechunk/cli",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "private": false,
   "type": "module",
   "scripts": {
@@ -10,6 +10,7 @@
     "format:check": "prettier --check .",
     "typecheck": "tsc",
     "typecheck-src": "tsc --skipLibCheck",
+    "typecheck-src:tsgo": "tsgo --skipLibCheck",
     "test": "echo 'no tests yet'",
     "build": "npm run build:clean && npm run build:cli",
     "build:clean": "rm -rf build",
@@ -23,21 +24,21 @@
     "#api": "./src/core-api/api.ts"
   },
   "dependencies": {
-    "argon2": "^0.41.1"
+    "argon2": "^0.44.0"
   },
   "devDependencies": {
-    "@commander-js/extra-typings": "^13.0.0",
+    "@commander-js/extra-typings": "^14.0.0",
     "@graphql-typed-document-node/core": "^3.2.0",
     "@types/archiver": "^6.0.3",
     "@wirechunk/backend-lib": "0.0.0",
     "@wirechunk/lib": "0.0.0",
     "archiver": "^7.0.1",
-    "chalk": "^5.3.0",
-    "commander": "^13.0.0",
+    "chalk": "^5.6.2",
+    "commander": "^14.0.2",
     "graphql-request": "^7.1.2",
-    "slonik": "^46.3.0",
-    "slonik-interceptor-query-logging": "^46.3.0",
-    "zod": "^3.24.1"
+    "slonik": "^48.8.7",
+    "slonik-interceptor-query-logging": "^48.8.7",
+    "zod": "^4.1.13"
   },
   "publishConfig": {
     "access": "public"

package/src/commands/create-extension-version.ts

@@ -23,8 +23,6 @@ const bytesFormat = Intl.NumberFormat('en', {
 const ignoreGlobs = [
   '**/.git/**/*',
   '.git/**/*',
-  'eslint.config.js',
-  '**/eslint.config.js',
   'node_modules/**/*',
   '**/node_modules/**/*',
   'yalc.lock',

package/src/commands/create-user.ts

@@ -9,17 +9,24 @@ import { detailedUniqueIntegrityConstraintViolationError } from '../errors.ts';
 import type { WithGlobalOptions } from '../global-options.ts';
 import { voidSelectSchema } from '../util.ts';
 
-const insertUserResult = z.object({
-  id: z.string(),
-});
-
 const findOrgResult = z.object({
   platformId: z.string(),
 });
 
+// Copied from backend-lib/roles.ts for now because different zod versions.
+const roleSchema = z.object({
+  id: z.string(),
+  name: z.string(),
+  default: z.boolean().optional().default(false),
+});
+
+// The schema for the platform roles configuration.
+const rolesSchema = z.array(roleSchema);
+
 const findPlatformResult = z.object({
   id: z.string(),
   name: z.string(),
+  roles: rolesSchema.nullable(),
 });
 
 type CreateUserOptions = {
@@ -29,7 +36,7 @@ type CreateUserOptions = {
   lastName: string;
   orgId?: string;
   platformId?: string;
-  role: string;
+  role?: string;
   emailVerified: boolean;
   pending: boolean;
 };
@@ -52,7 +59,7 @@ export const createUser = async (
     process.exit(1);
   }
   const password = await hashPassword(opts.password);
-  const { role } = opts;
+  const inputRole = opts.role || '';
   const status = opts.pending ? 'Pending' : 'Active';
   const firstName = opts.firstName.trim();
   if (!firstName.length) {
@@ -70,7 +77,8 @@ export const createUser = async (
   let orgPrimary = false;
 
   try {
-    const user = await db.transaction(async (db) => {
+    const userId = cleanSmallId();
+    await db.transaction(async (db) => {
       if (!platformId) {
         if (!orgId) {
           throw new Error('Either --org-id or --platform-id must be specified');
@@ -93,17 +101,61 @@ export const createUser = async (
           throw new Error(`Org ID ${orgId} does not belong to platform ID ${platformId}`);
         }
       }
+
       const platform = await db.maybeOne(
         sql.type(
           findPlatformResult,
-        )`select "id", "name" from "Platforms" where "id" = ${platformId}`,
+        )`select "id", "name", "roles" from "Platforms" where "id" = ${platformId}`,
       );
+
       if (!platform) {
         throw new Error(`No platform found with ID ${platformId}`);
       }
       if (opts.verbose) {
         console.log(`Found platform ${platform.name} (ID ${platform.id})`);
       }
+
+      // Determine the role to use.
+      let roleToUse = '';
+      if (platform.roles && platform.roles.length) {
+        if (inputRole) {
+          const roleExists = platform.roles.some((r) => r.name === inputRole);
+          if (roleExists) {
+            roleToUse = inputRole;
+          } else {
+            const validRoles = platform.roles.map((r) => r.name).join(', ');
+            console.error(
+              `Error: Invalid role "${inputRole}". Valid roles for this platform are: ${validRoles}`,
+            );
+            process.exit(1);
+          }
+        } else {
+          const defaultRole = platform.roles.find((r) => r.default);
+          if (defaultRole) {
+            roleToUse = defaultRole.name;
+            if (opts.verbose) {
+              console.log(`No role provided. Using default role: ${roleToUse}`);
+            }
+          } else {
+            // No default role exists and no role was provided.
+            if (opts.verbose) {
+              console.log(
+                'No default role exists and no role was provided. Using empty string for the role.',
+              );
+            }
+          }
+        }
+      } else {
+        // No roles defined for this platform.
+        if (inputRole) {
+          console.error('Error: A role was specified but no roles are defined for this platform.');
+          process.exit(1);
+        }
+        if (opts.verbose) {
+          console.log('No roles defined for this platform. Using empty string for the role.');
+        }
+      }
+
       if (!orgId) {
         orgId = cleanSmallId();
         await db.maybeOne(
@@ -117,23 +169,46 @@ export const createUser = async (
         orgPrimary = true;
       }
 
-      const user = await db.one(
-        sql.type(
-          insertUserResult,
-        )`insert into "Users" ("platformId", "email", "emailVerified", "password", "passwordStatus", "orgId", "role", "status", "firstName", "lastName") values (${platformId}, ${email}, ${opts.emailVerified}, ${password}, 'Ok', ${orgId}, ${role}, ${status}, ${firstName}, ${lastName}) returning "id"`,
+      const user = await db.maybeOne(
+        sql.type(voidSelectSchema)`insert into "Users" (
+          "id",
+          "platformId",
+          "email",
+          "emailVerified",
+          "password",
+          "passwordStatus",
+          "orgId",
+          "role",
+          "status",
+          "firstName",
+          "lastName"
+        )
+        values (
+          ${userId},
+          ${platformId},
+          ${email},
+          ${opts.emailVerified},
+          ${password},
+          'Ok',
+          ${orgId},
+          ${roleToUse},
+          ${status},
+          ${firstName},
+          ${lastName}
+        )`,
       );
 
       if (orgPrimary) {
         await db.maybeOne(
           sql.type(
             voidSelectSchema,
-          )`update "Orgs" set "primaryUserId" = ${user.id} where "id" = ${orgId}`,
+          )`update "Orgs" set "primaryUserId" = ${userId} where "id" = ${orgId}`,
         );
       }
 
       return user;
     });
-    console.log(`Created user (ID ${user.id})`);
+    console.log(`Created user (ID ${userId})`);
   } catch (e) {
     if (e instanceof UniqueIntegrityConstraintViolationError) {
       console.error(detailedUniqueIntegrityConstraintViolationError(e));

package/src/commands/ext-dev/init-db.ts

@@ -37,13 +37,14 @@ const initExtDb = async ({
 
   const extRoleIdent = sql.identifier([extensionRoleName]);
 
+  // Note the password_required 'false' option is needed for local development environments without passwords.
   await db.query(sql.unsafe`
     create user mapping if not exists for ${extRoleIdent} server wirechunk
     options (user ${sql.literalValue(extensionRoleName)}, password_required 'false')
   `);
   await db.query(sql.unsafe`
     create foreign table if not exists "Users" (
-      "id" uuid not null,
+      "id" text not null,
       "firstName" text not null,
       "lastName" text not null,
       "email" text not null,
@@ -59,7 +60,7 @@ const initExtDb = async ({
     create foreign table if not exists "Orgs" (
       "id" text not null,
       "name" text,
-      "primaryUserId" uuid,
+      "primaryUserId" text,
       "createdAt" timestamptz not null
     ) server wirechunk options (schema_name 'public', table_name 'Orgs')
   `);
@@ -217,11 +218,11 @@ export const initDb = async (
     db,
   });
 
-  const extDbSuper = new URL(extDb.url);
-  extDbSuper.username = coreDbUrlObject.username;
+  const superExtDb = new URL(extDb.url);
+  superExtDb.username = coreDbUrlObject.username;
 
   await initExtDb({
-    db: await createPool(extDbSuper.toString(), dbPoolOptions(opts)),
+    db: await createPool(superExtDb.toString(), dbPoolOptions(opts)),
     extensionRoleName: extRole,
     coreDbUrl: coreDbUrlObject,
   });