@wirechunk/cli 0.0.2 → 0.0.4

package/build/main.js

@@ -3955,15 +3955,14 @@ const normalizeEmailAddress = (email) => {
   }
   return { ok: true, value: emailTrimmed };
 };
-const defaultFormattedDataTemplate = `{{#each .}}{{@key}}: {{{.}}}
-{{/each}}`;
 const siteDomainKey = "siteDomain";
-const formattedDataKey = "formattedData";
 const submittedAtKey = "submittedAt";
+const defaultFormattedDataTemplate = `{{#each .}}{{@key}}: {{{.}}}
+{{/each}}`;
 const defaultNotificationEmailBodyTemplate = `Form entry from your site {{${siteDomainKey}}}:
 
-{{{${formattedDataKey}}}}
-
+{{#each .}}{{@key}}: {{{.}}}
+{{/each}}
 
 Submitted {{${submittedAtKey}}}
 `;
@@ -24957,22 +24956,16 @@ const bootstrap = async (opts, env2) => {
   } else {
     emailSendFrom = `site@${adminSiteDomain}`;
   }
-  const adminSiteName = `${name} Admin`;
   await db.transaction(async (db2) => {
     await db2.query(
       distExports$1.sql.type(
         voidSelectSchema
       )`insert into "Platforms" ("id", "handle", "name", "defaultFormFormattedDataTemplate", "defaultFormNotificationEmailBodyTemplate", "emailSendFromAddress") values (${platformId}, ${handle}, ${name}, ${defaultFormattedDataTemplate}, ${defaultNotificationEmailBodyTemplate}, ${emailSendFrom})`
     );
-    await db2.query(
-      distExports$1.sql.type(
-        voidSelectSchema
-      )`insert into "Sites" ("platformId", "domain", "name") values (${platformId}, ${adminSiteDomain}, ${adminSiteName})`
-    );
   });
   console.log(`Created platform ${name} with handle ${handle} (ID ${platformId})`);
 };
-const validateExtensionConfig$1 = validate25;
+const validateExtensionConfig = validate25;
 function validate25(data, { instancePath = "", parentData, parentDataProperty, rootData = data, dynamicAnchors = {} } = {}) {
   let vErrors = null;
   let errors2 = 0;
@@ -25256,8 +25249,8 @@ const numberExpressionSchema = {
 const $schema$8 = "https://json-schema.org/draft/2020-12/schema";
 const $id$9 = "/expressions/string-expression.json";
 const title$8 = "StringExpression";
-const oneOf$1 = [{ "$ref": "#/$defs/eventSourceComponentName" }, { "$ref": "#/$defs/eventSourceComponentType" }, { "$ref": "#/$defs/featureTag" }, { "$ref": "#/$defs/inputChangeEventStringValue" }, { "$ref": "#/$defs/inputDataString" }, { "$ref": "#/$defs/propsString" }, { "$ref": "#/$defs/stringLiteral" }, { "$ref": "#/$defs/userEmail" }, { "$ref": "#/$defs/userRole" }];
-const $defs$3 = { "eventSourceComponentName": { "type": "object", "properties": { "operator": { "const": "eventSourceComponentName" } }, "required": ["operator"] }, "eventSourceComponentType": { "type": "object", "properties": { "operator": { "const": "eventSourceComponentType" } }, "required": ["operator"] }, "featureTag": { "type": "object", "properties": { "operator": { "const": "featureTag" }, "tag": { "type": "string" } }, "required": ["operator", "tag"] }, "inputChangeEventStringValue": { "type": "object", "properties": { "operator": { "const": "inputChangeEventStringValue" } }, "required": ["operator"] }, "inputDataString": { "type": "object", "properties": { "operator": { "const": "inputDataString" }, "fieldKey": { "type": "string" } }, "required": ["operator", "fieldKey"] }, "propsString": { "type": "object", "properties": { "operator": { "const": "propsString" }, "prop": { "type": "string" } }, "required": ["operator", "prop"] }, "stringLiteral": { "type": "object", "properties": { "operator": { "const": "stringLiteral" }, "value": { "type": "string" } }, "required": ["operator", "value"] }, "userEmail": { "type": "object", "properties": { "operator": { "const": "userEmail" } }, "required": ["operator"] }, "userRole": { "type": "object", "properties": { "operator": { "const": "userRole" } }, "required": ["operator"] } };
+const oneOf$1 = [{ "$ref": "#/$defs/eventSourceComponentName" }, { "$ref": "#/$defs/eventSourceComponentType" }, { "$ref": "#/$defs/featureTag" }, { "$ref": "#/$defs/inputChangeEventStringValue" }, { "$ref": "#/$defs/inputDataString" }, { "$ref": "#/$defs/propsString" }, { "$ref": "#/$defs/stringLiteral" }, { "$ref": "#/$defs/userEmail" }, { "$ref": "#/$defs/userOrgId" }, { "$ref": "#/$defs/userRole" }];
+const $defs$3 = { "eventSourceComponentName": { "type": "object", "properties": { "operator": { "const": "eventSourceComponentName" } }, "required": ["operator"] }, "eventSourceComponentType": { "type": "object", "properties": { "operator": { "const": "eventSourceComponentType" } }, "required": ["operator"] }, "featureTag": { "type": "object", "properties": { "operator": { "const": "featureTag" }, "tag": { "type": "string" } }, "required": ["operator", "tag"] }, "inputChangeEventStringValue": { "type": "object", "properties": { "operator": { "const": "inputChangeEventStringValue" } }, "required": ["operator"] }, "inputDataString": { "type": "object", "properties": { "operator": { "const": "inputDataString" }, "fieldKey": { "type": "string" } }, "required": ["operator", "fieldKey"] }, "propsString": { "type": "object", "properties": { "operator": { "const": "propsString" }, "prop": { "type": "string" } }, "required": ["operator", "prop"] }, "stringLiteral": { "type": "object", "properties": { "operator": { "const": "stringLiteral" }, "value": { "type": "string" } }, "required": ["operator", "value"] }, "userEmail": { "type": "object", "properties": { "operator": { "const": "userEmail" } }, "required": ["operator"] }, "userOrgId": { "type": "object", "properties": { "operator": { "const": "userOrgId" } }, "required": ["operator"] }, "userRole": { "type": "object", "properties": { "operator": { "const": "userRole" } }, "required": ["operator"] } };
 const stringExpressionSchema = {
   $schema: $schema$8,
   $id: $id$9,
@@ -32035,7 +32028,7 @@ const preCompiledSafeValidator = (validate2) => (value) => {
     error: errorsText(validate2)
   };
 };
-const validateExtensionConfig = preCompiledSafeValidator(validateExtensionConfig$1);
+const validateExtensionManifest = preCompiledSafeValidator(validateExtensionConfig);
 const requireValidExtensionDir = async (dir2) => {
   const extConfigPath = resolve$1(dir2, "extension.json");
   if (!existsSync(extConfigPath)) {
@@ -32043,7 +32036,7 @@ const requireValidExtensionDir = async (dir2) => {
     process.exit(1);
   }
   const extConfig = JSON.parse(await readFile(extConfigPath, "utf8"));
-  const validateResult = validateExtensionConfig(extConfig);
+  const validateResult = validateExtensionManifest(extConfig);
   if (validateResult.ok) {
     const config2 = validateResult.value;
     if (config2.components) {
@@ -32059,7 +32052,7 @@ const requireValidExtensionDir = async (dir2) => {
         }
       }
     }
-    return { ...config2, dir: dir2 };
+    return { manifest: config2, dir: dir2 };
   }
   console.error(`Invalid extension config file:`, validateResult.error);
   process.exit(1);
@@ -60711,20 +60704,20 @@ const createExtensionVersion = async (opts, env2) => {
   const extensionId = requireExtensionIdOptionOrEnvVar(opts, env2);
   const apiToken = requireApiToken(env2);
   const cwd = process.cwd();
-  const extConfig = await requireValidExtensionDir(cwd);
+  const { manifest } = await requireValidExtensionDir(cwd);
   let enableServer;
   let enableDb;
-  if (extConfig.server) {
-    enableServer = !!extConfig.server.enable;
-    if (extConfig.server.database?.enable && extConfig.server.enable === false) {
+  if (manifest.server) {
+    enableServer = !!manifest.server.enable;
+    if (manifest.server.database?.enable && manifest.server.enable === false) {
       console.warn("WARNING: Automatically disabling database because server is disabled");
       enableDb = false;
-    } else if (extConfig.server.database?.enable && !extConfig.server.enable) {
+    } else if (manifest.server.database?.enable && !manifest.server.enable) {
       console.warn("WARNING: Automatically enabling server because database is enabled");
       enableServer = true;
       enableDb = true;
     } else {
-      enableDb = !!extConfig.server.database?.enable;
+      enableDb = !!manifest.server.database?.enable;
     }
   } else {
     enableServer = false;
@@ -60748,7 +60741,7 @@ const createExtensionVersion = async (opts, env2) => {
   console.log(`Creating extension version ${versionName} (Extension ID ${extensionId})
   Server: ${enableServer ? "enabled" : "disabled"}
   Database: ${enableDb ? "enabled" : "disabled"}
-  Components: ${Object.keys(extConfig.components ?? {}).length}`);
+  Components: ${Object.keys(manifest.components ?? {}).length}`);
   let extensionVersionId;
   let signedUrl;
   try {
@@ -60761,8 +60754,9 @@ const createExtensionVersion = async (opts, env2) => {
       variables: {
         input: {
           extensionId,
-          extensionName: extConfig.name,
+          extensionName: manifest.name,
           versionName,
+          manifest: JSON.stringify(manifest),
           enableServer,
           enableDb,
           config: config2 ? JSON.stringify(config2) : void 0
@@ -60991,82 +60985,180 @@ const createUser = async (opts, env2) => {
     process.exit(1);
   }
 };
-const PermissionName = {
-  /** Create (i.e., add) extensions. */
-  CreateExtension: "CreateExtension",
-  /** Create extension versions for existing extensions. This includes deploying new code. */
-  CreateExtensionVersion: "CreateExtensionVersion",
-  /** Create sites. */
-  CreateSite: "CreateSite",
-  /** Create page and form templates. */
-  CreateTemplate: "CreateTemplate",
-  /** Create a user in any org. */
-  CreateUser: "CreateUser",
-  /** Edit or manage everything else not covered by other permissions. */
-  Edit: "Edit",
-  /** Edit, including creating and deleting, any component. */
-  EditComponent: "EditComponent",
-  /** Edit, including creating and deleting, any course. */
-  EditCourse: "EditCourse",
-  /** Edit, including creating and deleting, any custom component. */
-  EditCustomComponent: "EditCustomComponent",
-  /** Edit, including creating and deleting, any custom field. */
-  EditCustomField: "EditCustomField",
-  /** Edit any customer site, including its pages and forms, but not necessarily domain. */
-  EditCustomerSite: "EditCustomerSite",
-  /** Edit any extension. This does not include creating extension versions (i.e., deploying new code). */
-  EditExtension: "EditExtension",
-  /** Edit any help ticket's status. */
-  EditHelpTicketStatus: "EditHelpTicketStatus",
-  /** Edit any platform site, including its pages and forms, but not necessarily domain. */
-  EditPlatformSite: "EditPlatformSite",
-  /** Edit, including creating and deleting, any sequence. */
-  EditSequence: "EditSequence",
-  /** Edit any user's position in a sequence. */
-  EditSequenceUser: "EditSequenceUser",
-  /** Edit any site's settings, pages, forms, and layouts. */
-  EditSite: "EditSite",
-  /** Edit any site's domain. */
-  EditSiteDomain: "EditSiteDomain",
-  /** Edit any site's TLS certificate, including creating and deleting certificates. Does not including editing TLS certificates. */
-  EditSiteTlsCertificate: "EditSiteTlsCertificate",
-  /** Edit any subscription. */
-  EditSubscription: "EditSubscription",
-  /** Edit any page and form template. */
-  EditTemplate: "EditTemplate",
-  /** Edit any user's email address. */
-  EditUserEmail: "EditUserEmail",
-  /** Edit which org any user is in and whether a user is an org owner. */
-  EditUserOrg: "EditUserOrg",
-  /** Edit any user's first and last name. */
-  EditUserProfile: "EditUserProfile",
-  /** Edit any user's role. */
-  EditUserRole: "EditUserRole",
-  /** Edit any user's status. */
-  EditUserStatus: "EditUserStatus",
-  /** Sync any form template to forms. */
-  SyncFormTemplateToForms: "SyncFormTemplateToForms",
-  /** Sync any page template to pages. */
-  SyncPageTemplateToPages: "SyncPageTemplateToPages",
-  /** View anything except for sites. */
-  View: "View",
-  /** View any course. */
-  ViewCourse: "ViewCourse",
-  /** View any extension. */
-  ViewExtension: "ViewExtension",
-  /** View any site, including pages, forms, and layouts, and components. */
-  ViewSite: "ViewSite",
-  /** View any page or form template. */
-  ViewTemplate: "ViewTemplate"
+const permissionExtensionCreate = {
+  object: "Extension",
+  action: "create"
+};
+const permissionExtensionCreateVersion = {
+  object: "Extension",
+  action: "createVersion"
+};
+const permissionSiteCreate = {
+  object: "Site",
+  action: "create"
+};
+const permissionTemplateCreate = {
+  object: "Template",
+  action: "create"
+};
+const permissionUserCreate = {
+  object: "User",
+  action: "create"
+};
+const permissionPlatformEdit = {
+  object: "Platform",
+  action: "edit"
+};
+const permissionComponentEdit = {
+  object: "Component",
+  action: "edit"
+};
+const permissionCourseEdit = {
+  object: "Course",
+  action: "edit"
+};
+const permissionCustomComponentEdit = {
+  object: "CustomComponent",
+  action: "edit"
+};
+const permissionCustomFieldEdit = {
+  object: "CustomField",
+  action: "edit"
+};
+const permissionCustomerSiteEdit = {
+  object: "CustomerSite",
+  action: "edit"
+};
+const permissionExtensionEdit = {
+  object: "Extension",
+  action: "edit"
+};
+const permissionHelpTicketEditStatus = {
+  object: "HelpTicket",
+  action: "editStatus"
+};
+const permissionPlatformSiteEdit = {
+  object: "PlatformSite",
+  action: "edit"
+};
+const permissionSequenceEdit = {
+  object: "Sequence",
+  action: "edit"
+};
+const permissionSequenceUserEdit = {
+  object: "SequenceUser",
+  action: "edit"
+};
+const permissionSiteEdit = {
+  object: "Site",
+  action: "edit"
 };
-const allPermissions = Object.values(PermissionName);
+const permissionSiteEditDomain = {
+  object: "Site",
+  action: "editDomain"
+};
+const permissionSiteEditTls = {
+  object: "Site",
+  action: "editTls"
+};
+const permissionSubscriptionEdit = {
+  object: "Subscription",
+  action: "edit"
+};
+const permissionTemplateEdit = {
+  object: "Template",
+  action: "edit"
+};
+const permissionUserEditEmail = {
+  object: "User",
+  action: "editEmail"
+};
+const permissionUserEditOrg = {
+  object: "User",
+  action: "editOrg"
+};
+const permissionUserEditStatus = {
+  object: "User",
+  action: "editStatus"
+};
+const permissionUserEditRole = {
+  object: "User",
+  action: "editRole"
+};
+const permissionUserEditProfile = {
+  object: "User",
+  action: "editProfile"
+};
+const permissionFormTemplateSync = {
+  object: "FormTemplate",
+  action: "sync"
+};
+const permissionPageTemplateSync = {
+  object: "PageTemplate",
+  action: "sync"
+};
+const permissionPlatformView = {
+  object: "Platform",
+  action: "view"
+};
+const permissionCourseView = {
+  object: "Course",
+  action: "view"
+};
+const permissionExtensionView = {
+  object: "Extension",
+  action: "view"
+};
+const permissionSiteView = {
+  object: "Site",
+  action: "view"
+};
+const permissionTemplateView = {
+  object: "Template",
+  action: "view"
+};
+const allPermissions = [
+  permissionExtensionCreate,
+  permissionExtensionCreateVersion,
+  permissionSiteCreate,
+  permissionTemplateCreate,
+  permissionUserCreate,
+  permissionPlatformEdit,
+  permissionComponentEdit,
+  permissionCourseEdit,
+  permissionCustomComponentEdit,
+  permissionCustomFieldEdit,
+  permissionCustomerSiteEdit,
+  permissionExtensionEdit,
+  permissionHelpTicketEditStatus,
+  permissionPlatformSiteEdit,
+  permissionSequenceEdit,
+  permissionSequenceUserEdit,
+  permissionSiteEdit,
+  permissionSiteEditDomain,
+  permissionSiteEditTls,
+  permissionSubscriptionEdit,
+  permissionTemplateEdit,
+  permissionUserEditEmail,
+  permissionUserEditOrg,
+  permissionUserEditStatus,
+  permissionUserEditRole,
+  permissionUserEditProfile,
+  permissionFormTemplateSync,
+  permissionPageTemplateSync,
+  permissionPlatformView,
+  permissionCourseView,
+  permissionExtensionView,
+  permissionSiteView,
+  permissionTemplateView
+];
 const revokeAllUserPlatformPermissions = async ({
   platformAdminId
 }, db) => {
   await db.query(
     distExports$1.sql.type(
       voidSelectSchema
-    )`delete from "PlatformAdminPermissions" where "id" = ${platformAdminId}`
+    )`delete from "Permissions" where "platformAdminId" = ${platformAdminId}`
   );
 };
 const grantAllUserPlatformPermissions = async ({
@@ -61075,12 +61167,12 @@ const grantAllUserPlatformPermissions = async ({
   await db.query(
     distExports$1.sql.type(
       voidSelectSchema
-    )`insert into "PlatformAdminPermissions" ("id", "platformAdminId", "permission") values ${distExports$1.sql.join(
+    )`insert into "Permissions" ("id", "platformAdminId", "object", "action") values ${distExports$1.sql.join(
       allPermissions.map(
-        (permission) => distExports$1.sql.fragment`(${cleanSmallId()}, ${platformAdminId}, ${permission})`
+        (permission) => distExports$1.sql.fragment`(${cleanSmallId()}, ${platformAdminId}, ${permission.object}, ${permission.action})`
       ),
       distExports$1.sql.fragment`,`
-    )} on conflict ("platformAdminId", "permission") do nothing`
+    )} on conflict ("platformAdminId", "object", "action") do nothing`
   );
 };
 const findPlatformAdminSchema = z.object({
@@ -61120,10 +61212,18 @@ const editAdmin = async (opts, env2) => {
           platformAdmin = await db2.one(
             distExports$1.sql.type(findPlatformAdminSchema)`
               insert into "PlatformAdmins" ("id", "platformId", "userId", "owner", "active")
-              values (${cleanSmallId()}, ${platformId}, ${userId}, ${active ?? true}, true)
+              values (${cleanSmallId()}, ${platformId}, ${userId}, true, ${active ?? true})
               returning "id", "platformId", "active"
             `
           );
+        } else {
+          await db2.query(
+            distExports$1.sql.type(voidSelectSchema)`
+              update "PlatformAdmins"
+              set "owner" = true
+              where "id" = ${platformAdmin.id}
+            `
+          );
         }
         await grantAllUserPlatformPermissions({ platformAdminId: platformAdmin.id }, db2);
         if (opts.verbose) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wirechunk/cli",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "private": false,
   "type": "module",
   "scripts": {

package/src/commands/bootstrap.ts

@@ -23,6 +23,7 @@ const randomString = () => randomUUID().replaceAll('-', '').slice(0, 10);
 type BootstrapOptions = {
   name: string;
   handle?: string;
+  // TODO: Require this be set in the environment instead.
   adminSiteDomain: string;
   emailSendFrom?: string;
 };
@@ -61,7 +62,6 @@ export const bootstrap = async (
   } else {
     emailSendFrom = `site@${adminSiteDomain}`;
   }
-  const adminSiteName = `${name} Admin`;
 
   await db.transaction(async (db) => {
     await db.query(
@@ -69,12 +69,6 @@ export const bootstrap = async (
         voidSelectSchema,
       )`insert into "Platforms" ("id", "handle", "name", "defaultFormFormattedDataTemplate", "defaultFormNotificationEmailBodyTemplate", "emailSendFromAddress") values (${platformId}, ${handle}, ${name}, ${defaultFormattedDataTemplate}, ${defaultNotificationEmailBodyTemplate}, ${emailSendFrom})`,
     );
-
-    await db.query(
-      sql.type(
-        voidSelectSchema,
-      )`insert into "Sites" ("platformId", "domain", "name") values (${platformId}, ${adminSiteDomain}, ${adminSiteName})`,
-    );
   });
 
   console.log(`Created platform ${name} with handle ${handle} (ID ${platformId})`);

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

@@ -44,22 +44,22 @@ export const createExtensionVersion = async (
   const extensionId = requireExtensionIdOptionOrEnvVar(opts, env);
   const apiToken = requireApiToken(env);
   const cwd = process.cwd();
-  const extConfig = await requireValidExtensionDir(cwd);
+  const { manifest } = await requireValidExtensionDir(cwd);
   let enableServer: boolean;
   let enableDb: boolean;
-  if (extConfig.server) {
-    enableServer = !!extConfig.server.enable;
-    if (extConfig.server.database?.enable && extConfig.server.enable === false) {
+  if (manifest.server) {
+    enableServer = !!manifest.server.enable;
+    if (manifest.server.database?.enable && manifest.server.enable === false) {
       // Server was explicitly disabled, so don't allow database.
       console.warn('WARNING: Automatically disabling database because server is disabled');
       enableDb = false;
-    } else if (extConfig.server.database?.enable && !extConfig.server.enable) {
+    } else if (manifest.server.database?.enable && !manifest.server.enable) {
       // Server was unspecified, so enable it because database is enabled.
       console.warn('WARNING: Automatically enabling server because database is enabled');
       enableServer = true;
       enableDb = true;
     } else {
-      enableDb = !!extConfig.server.database?.enable;
+      enableDb = !!manifest.server.database?.enable;
     }
   } else {
     enableServer = false;
@@ -84,7 +84,7 @@ export const createExtensionVersion = async (
   console.log(`Creating extension version ${versionName} (Extension ID ${extensionId})
   Server: ${enableServer ? 'enabled' : 'disabled'}
   Database: ${enableDb ? 'enabled' : 'disabled'}
-  Components: ${Object.keys(extConfig.components ?? {}).length}`);
+  Components: ${Object.keys(manifest.components ?? {}).length}`);
 
   let extensionVersionId: string;
   let signedUrl: string;
@@ -98,8 +98,9 @@ export const createExtensionVersion = async (
       variables: {
         input: {
           extensionId,
-          extensionName: extConfig.name,
+          extensionName: manifest.name,
           versionName,
+          manifest: JSON.stringify(manifest),
           enableServer,
           enableDb,
           config: config ? JSON.stringify(config) : undefined,

package/src/commands/edit-admin.ts

@@ -63,10 +63,18 @@ export const editAdmin = async (
           platformAdmin = await db.one(
             sql.type(findPlatformAdminSchema)`
               insert into "PlatformAdmins" ("id", "platformId", "userId", "owner", "active")
-              values (${cleanSmallId()}, ${platformId}, ${userId}, ${active ?? true}, true)
+              values (${cleanSmallId()}, ${platformId}, ${userId}, true, ${active ?? true})
               returning "id", "platformId", "active"
             `,
           );
+        } else {
+          await db.query(
+            sql.type(voidSelectSchema)`
+              update "PlatformAdmins"
+              set "owner" = true
+              where "id" = ${platformAdmin.id}
+            `,
+          );
         }
         await grantAllUserPlatformPermissions({ platformAdminId: platformAdmin.id }, db);
         if (opts.verbose) {