Feature(OGCIO): v1.20.0

.dockerignore

@@ -33,4 +33,4 @@ dump.rdb
 .devcontainer
 .github
 .husky
-.vscode
+.vscode

.scripts/compare-database.js

@@ -1,8 +1,12 @@
 import pg from 'pg';
 import assert from 'node:assert';
 
-const omit = (object, ...keys) => Object.fromEntries(Object.entries(object).filter(([key]) => !keys.includes(key)));
-const omitArray = (arrayOfObjects, ...keys) => arrayOfObjects.map((value) => omit(value, ...keys));
+const omit = (object, ...keys) =>
+  Object.fromEntries(
+    Object.entries(object).filter(([key]) => !keys.includes(key))
+  );
+const omitArray = (arrayOfObjects, ...keys) =>
+  arrayOfObjects.map((value) => omit(value, ...keys));
 
 const schemas = ['cloud', 'public'];
 const schemasArray = `(${schemas.map((schema) => `'${schema}'`).join(', ')})`;
@@ -17,31 +21,35 @@ const tryCompare = (a, b) => {
 };
 
 const queryDatabaseManifest = async (database) => {
-  const pool = new pg.Pool({ database, user: 'postgres', password: 'postgres' });
+  const pool = new pg.Pool({
+    database,
+    user: 'postgres',
+    password: 'postgres',
+  });
 
-  const { rows: tables } = await pool.query(/* sql */`
+  const { rows: tables } = await pool.query(/* sql */ `
     select *
     from information_schema.tables
     where table_schema in ${schemasArray}
     order by table_schema, table_name asc;
   `);
 
-  const { rows: columns } = await pool.query(/* sql */`
+  const { rows: columns } = await pool.query(/* sql */ `
     select *
     from information_schema.columns 
     where table_schema in ${schemasArray}
     order by table_schema, table_name, column_name asc;
   `);
 
-  const { rows: enums } = await pool.query(/* sql */`
+  const { rows: enums } = await pool.query(/* sql */ `
     select pg_type.typname, pg_enum.enumlabel
     from pg_type 
     join pg_enum 
     on pg_enum.enumtypid = pg_type.oid
     order by pg_type.typname, pg_enum.enumlabel asc;
   `);
 
-  const { rows: constraints } = await pool.query(/* sql */`
+  const { rows: constraints } = await pool.query(/* sql */ `
     select conrelid::regclass as r_table, con.*, pg_get_constraintdef(con.oid) as def
     from pg_catalog.pg_constraint con
     inner join pg_catalog.pg_class rel
@@ -52,14 +60,14 @@ const queryDatabaseManifest = async (database) => {
     order by conname asc, def asc;
   `);
 
-  const { rows: indexes } = await pool.query(/* sql */`
+  const { rows: indexes } = await pool.query(/* sql */ `
     select *
     from pg_indexes
     where schemaname in ${schemasArray}
     order by schemaname, indexname asc;
   `);
 
-  const { rows: funcs } = await pool.query(/* sql */`
+  const { rows: funcs } = await pool.query(/* sql */ `
     select n.nspname as schema_name,
       p.proname as specific_name,
       case p.prokind 
@@ -83,15 +91,19 @@ const queryDatabaseManifest = async (database) => {
     order by schema_name, specific_name;
   `);
 
-  const { rows: triggers } = await pool.query(/* sql */`select * from information_schema.triggers;`);
-  const { rows: policies } = await pool.query(/* sql */`select * from pg_policies order by tablename, policyname;`);
-  const { rows: columnGrants } = await pool.query(/* sql */`
+  const { rows: triggers } = await pool.query(
+    /* sql */ `select * from information_schema.triggers;`
+  );
+  const { rows: policies } = await pool.query(
+    /* sql */ `select * from pg_policies order by tablename, policyname;`
+  );
+  const { rows: columnGrants } = await pool.query(/* sql */ `
     select * from information_schema.role_column_grants
     where table_schema in ${schemasArray}
       and grantee != 'postgres'
     order by table_schema, grantee, table_name, column_name, privilege_type;
   `);
-  const { rows: tableGrants } = await pool.query(/* sql */`
+  const { rows: tableGrants } = await pool.query(/* sql */ `
     select * from information_schema.role_table_grants
     where table_schema in ${schemasArray}
       and grantee != 'postgres'
@@ -130,10 +142,19 @@ const queryDatabaseManifest = async (database) => {
   const normalizePolicyname = ({ policyname, ...rest }) => {
     const prefix = 'allow_';
     const suffix = '_access';
-    if (policyname && policyname.startsWith(prefix) && policyname.endsWith(suffix)) {
+    if (
+      policyname &&
+      policyname.startsWith(prefix) &&
+      policyname.endsWith(suffix)
+    ) {
       // This is a naming convention in Logto cloud, it is formatted as `allow_{role_name}_access`, we need to normalize the role name part for the convenience of comparing DB updates.
       // Ref: https://github.com/logto-io/cloud/pull/738
-      return { policyname: `${prefix}${normalizeRoleName(policyname.slice(prefix.length, -suffix.length))}${suffix}`, ...rest };
+      return {
+        policyname: `${prefix}${normalizeRoleName(
+          policyname.slice(prefix.length, -suffix.length)
+        )}${suffix}`,
+        ...rest,
+      };
     }
 
     return { policyname, ...rest };
@@ -142,12 +163,18 @@ const queryDatabaseManifest = async (database) => {
   // Omit generated ids and values
   return {
     tables: omitArray(tables, 'table_catalog'),
-    columns: omitArray(columns, 'table_catalog', 'udt_catalog', 'ordinal_position', 'dtd_identifier'),
+    columns: omitArray(
+      columns,
+      'table_catalog',
+      'udt_catalog',
+      'ordinal_position',
+      'dtd_identifier'
+    ),
     enums,
     constraints: omitArray(
       constraints,
       'oid',
-      /** 
+      /**
        * See https://www.postgresql.org/docs/current/catalog-pg-constraint.html, better to use `pg_get_constraintdef()`
        * to extract the definition of check constraint, so this can be omitted since conbin changes with the status of the computing resources.
        */
@@ -164,18 +191,20 @@ const queryDatabaseManifest = async (database) => {
       'conppeqop',
       'conffeqop',
       'confdelsetcols',
-      'conexclop',
+      'conexclop'
     ),
     indexes,
     funcs,
     triggers: omitArray(triggers, 'trigger_catalog', 'event_object_catalog'),
     policies: policies.map(normalizeRoles).map(normalizePolicyname),
-    columnGrants: omitArray(columnGrants, 'table_catalog').map(normalizeGrantee),
+    columnGrants: omitArray(columnGrants, 'table_catalog').map(
+      normalizeGrantee
+    ),
     tableGrants: omitArray(tableGrants, 'table_catalog').map(normalizeGrantee),
   };
 };
 
-const [,, database1, database2] = process.argv;
+const [, , database1, database2] = process.argv;
 
 console.log('Compare database manifest between', database1, 'and', database2);
 
@@ -191,6 +220,23 @@ const autoCompare = (a, b) => {
     return (typeof a).localeCompare(typeof b);
   }
 
+  if (typeof a === 'object' && a !== null && b !== null) {
+    const aKeys = Object.keys(a).sort();
+    const bKeys = Object.keys(b).sort();
+
+    for (let i = 0; i < Math.min(aKeys.length, bKeys.length); i++) {
+      if (aKeys[i] !== bKeys[i]) {
+        return aKeys[i].localeCompare(bKeys[i]);
+      }
+      const comparison = autoCompare(a[aKeys[i]], b[bKeys[i]]);
+      if (comparison !== 0) {
+        return comparison;
+      }
+    }
+
+    return aKeys.length - bKeys.length;
+  }
+
   return String(a).localeCompare(String(b));
 };
 
@@ -200,15 +246,24 @@ const buildSortByKeys = (keys) => (a, b) => {
 };
 
 const queryDatabaseData = async (database) => {
-  const pool = new pg.Pool({ database, user: 'postgres', password: 'postgres' });
-  const result = await Promise.all(manifests[0].tables
-    .map(async ({ table_schema, table_name }) => {
-      const { rows } = await pool.query(/* sql */`select * from ${table_schema}.${table_name};`);
+  const pool = new pg.Pool({
+    database,
+    user: 'postgres',
+    password: 'postgres',
+  });
+  const result = await Promise.all(
+    manifests[0].tables.map(async ({ table_schema, table_name }) => {
+      const { rows } = await pool.query(
+        /* sql */ `select * from ${table_schema}.${table_name};`
+      );
 
       // check config rows except the value column
       if (['logto_configs', '_logto_configs', 'systems'].includes(table_name)) {
         const data = omitArray(rows, 'value');
-        return [table_name, data.sort(buildSortByKeys(Object.keys(data[0] ?? {})))];
+        return [
+          table_name,
+          data.sort(buildSortByKeys(Object.keys(data[0] ?? {}))),
+        ];
       }
 
       const data = omitArray(
@@ -234,4 +289,7 @@ const queryDatabaseData = async (database) => {
 
 console.log('Compare database data between', database1, 'and', database2);
 
-tryCompare(await queryDatabaseData(database1), await queryDatabaseData(database2));
+tryCompare(
+  await queryDatabaseData(database1),
+  await queryDatabaseData(database2)
+);

commitlint.config.ts

@@ -7,7 +7,7 @@ const config: UserConfig = {
   extends: ['@commitlint/config-conventional'],
   rules: {
     'type-enum': [2, 'always', [...conventional.rules['type-enum'][2], 'api', 'release']],
-    'scope-enum': [2, 'always', ['connector', 'console', 'core', 'demo-app', 'test', 'phrases', 'schemas', 'shared', 'experience', 'deps', 'deps-dev', 'cli', 'toolkit', 'cloud', 'app-insights', 'elements']],
+    'scope-enum': [2, 'always', ['connector', 'console', 'core', 'demo-app', 'test', 'phrases', 'schemas', 'shared', 'experience', 'experience-legacy', 'deps', 'deps-dev', 'cli', 'toolkit', 'cloud', 'app-insights', 'elements', 'translate', 'tunnel']],
     // Slightly increase the tolerance to allow the appending PR number
     ...(isCi && { 'header-max-length': [2, 'always', 110] }),
     'body-max-line-length': [2, 'always', 110],

package.json

@@ -10,10 +10,11 @@
     "prepack": "pnpm -r prepack",
     "dev": "pnpm -r prepack && pnpm start:dev",
     "dev:cloud": "IS_CLOUD=1 CONSOLE_PUBLIC_URL=/ pnpm dev",
-    "start:dev": "pnpm -r --parallel --filter=!@logto/integration-tests --filter \"!./packages/connectors/connector-*\" dev",
+    "start:dev": "pnpm -r --parallel --filter=!@logto/integration-tests --filter=!@logto/experience-legacy --filter \"!./packages/connectors/connector-*\" dev",
     "start": "cd packages/core && NODE_ENV=production node .",
     "ogcio:start": "cd packages/core && node .",
     "cli": "logto",
+    "translate": "logto-translate",
     "changeset": "changeset",
     "alteration": "logto db alt",
     "connectors": "pnpm -r --filter \"./packages/connectors/connector-*\"",
@@ -53,6 +54,7 @@
     }
   },
   "dependencies": {
-    "@logto/cli": "workspace:^1.1.0"
+    "@logto/cli": "workspace:^",
+    "@logto/translate": "workspace:^"
   }
 }

packages/cli/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+## 1.20.0
+
+### Minor Changes
+
+- 0183d0c33: split translate command from @logto/cli and create a standalone package
+
+  The "translate" command has greatly increased the size of the "@logto/cli" package, as it involves TypeScript code manipulation and has to use "typescrpt" as a "dependency".
+  In fact, only a small number of developers who want to contribute Logto will use this command, so we believe it's best to separate the less frequently used "translate" command from the "cli" package to keep it small and simple.
+
+  Please also be noted that this change is actually a breaking change for those who use the "translate" command. However, the CLI has to be bundle-released with the "Logto" open-source distribution, and we feel it is still too early to make a major version bump for Logto. Therefore, the "minor" bump is used this time.
+
+### Patch Changes
+
+- Updated dependencies [e0326c96c]
+- Updated dependencies [25187ef63]
+- Updated dependencies [479d5895a]
+  - @logto/[email protected]
+
 ## 1.19.0
 
 ### Minor Changes

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/cli",
-  "version": "1.19.0",
+  "version": "1.20.0",
   "description": "Logto CLI.",
   "author": "Silverhand Inc. <[email protected]>",
   "homepage": "https://github.com/logto-io/logto#readme",
@@ -44,10 +44,7 @@
   "dependencies": {
     "@logto/connector-kit": "workspace:^4.0.0",
     "@logto/core-kit": "workspace:^2.5.0",
-    "@logto/language-kit": "workspace:^1.1.0",
-    "@logto/phrases": "workspace:^1.13.0",
-    "@logto/phrases-experience": "workspace:^1.7.0",
-    "@logto/schemas": "workspace:1.19.0",
+    "@logto/schemas": "workspace:1.20.0",
     "@logto/shared": "workspace:^3.1.1",
     "@silverhand/essentials": "^2.9.1",
     "@silverhand/slonik": "31.0.0-beta.2",
@@ -56,19 +53,14 @@
     "dotenv": "^16.4.5",
     "got": "^14.0.0",
     "hpagent": "^1.2.0",
-    "http-proxy-middleware": "^3.0.0",
     "inquirer": "^9.0.0",
-    "mime": "^4.0.4",
     "nanoid": "^5.0.1",
     "ora": "^8.0.1",
     "p-limit": "^6.0.0",
-    "p-queue": "^8.0.0",
     "p-retry": "^6.0.0",
     "pg-protocol": "^1.6.0",
-    "roarr": "^7.11.0",
     "semver": "^7.3.8",
     "tar": "^7.0.0",
-    "typescript": "^5.5.3",
     "yargs": "^17.6.0",
     "zod": "^3.23.8"
   },
@@ -82,11 +74,12 @@
     "@types/tar": "^6.1.12",
     "@types/yargs": "^17.0.13",
     "@vitest/coverage-v8": "^2.0.0",
-    "@withtyped/server": "^0.13.6",
+    "@withtyped/server": "^0.14.0",
     "eslint": "^8.56.0",
     "lint-staged": "^15.0.0",
     "prettier": "^3.0.0",
     "sinon": "^18.0.0",
+    "typescript": "^5.5.3",
     "vitest": "^2.0.0"
   },
   "eslintConfig": {

packages/cli/src/commands/database/seed/tables.ts

@@ -181,7 +181,8 @@ export const seedTables = async (
         ({ name }) =>
           name === CloudScope.SendSms ||
           name === CloudScope.SendEmail ||
-          name === CloudScope.FetchCustomJwt
+          name === CloudScope.FetchCustomJwt ||
+          name === CloudScope.ReportSubscriptionUpdates
       )
       .map(({ id }) => id)
   );