runlify 0.0.778 → 0.0.782

package/build/projectsGeneration/utils/databaseMeta.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prismaDatasourceMigrationEnvVar = exports.prismaDatasourceWriteEnvVar = exports.databaseNameToEnvSuffix = exports.buildConfigVarsForAdditionalDatabase = exports.validateEntityDatabaseName = exports.postgresUrlDatabaseName = void 0;
+const change_case_1 = require("change-case");
+const ENTITY_DATABASE_NAME_RE = /^[a-z][a-zA-Z0-9]*$/;
+const postgresUrlDatabaseName = (metaDbName) => metaDbName === 'main' ? 'postgres' : (0, change_case_1.snakeCase)(metaDbName);
+exports.postgresUrlDatabaseName = postgresUrlDatabaseName;
+const validateEntityDatabaseName = (name) => {
+    if (name === 'main') {
+        return;
+    }
+    if (!ENTITY_DATABASE_NAME_RE.test(name)) {
+        throw new Error(`Invalid database name "${name}": use a reserved "main" or an identifier matching ${ENTITY_DATABASE_NAME_RE}.`);
+    }
+};
+exports.validateEntityDatabaseName = validateEntityDatabaseName;
+/** Config vars for a non-main database (mirrors database.main.* in SystemMetaBuilder). */
+const buildConfigVarsForAdditionalDatabase = (dbName) => {
+    const titleBase = `База данных "${dbName}"`;
+    const defaultBase = `postgresql://postgres:password@localhost:5432/${(0, exports.postgresUrlDatabaseName)(dbName)}`;
+    return [
+        {
+            name: `database.${dbName}.write.uri`,
+            type: 'string',
+            required: true,
+            default: defaultBase,
+            needFor: `${titleBase}: строка подключения для записи`,
+            scopes: ['back', 'worker', 'telegramBot'],
+            hidden: true,
+            editable: false,
+        },
+        {
+            name: `database.${dbName}.readOnly.uri`,
+            type: 'string',
+            required: false,
+            default: defaultBase,
+            needFor: `${titleBase}: строка подключения только для чтения`,
+            scopes: ['back', 'worker', 'telegramBot'],
+            hidden: true,
+            editable: false,
+        },
+        {
+            name: `database.${dbName}.readOnly.enabled`,
+            type: 'bool',
+            required: true,
+            default: false,
+            needFor: `${titleBase}: включено ли отдельное подключение для чтения`,
+            scopes: ['back', 'worker', 'telegramBot'],
+            hidden: false,
+            editable: true,
+        },
+        {
+            name: `database.${dbName}.migration.uri`,
+            type: 'string',
+            required: true,
+            default: defaultBase,
+            needFor: `${titleBase}: строка подключения для миграций (без pgbouncer)`,
+            scopes: ['back', 'worker', 'telegramBot'],
+            hidden: true,
+            editable: false,
+        },
+    ];
+};
+exports.buildConfigVarsForAdditionalDatabase = buildConfigVarsForAdditionalDatabase;
+const databaseNameToEnvSuffix = (dbName) => dbName.replace(/([A-Z])/gu, '_$1').replace(/^_/, '').toUpperCase();
+exports.databaseNameToEnvSuffix = databaseNameToEnvSuffix;
+const prismaDatasourceWriteEnvVar = (database) => database === 'main'
+    ? 'DATABASE_MAIN_WRITE_URI'
+    : `DATABASE_${(0, exports.databaseNameToEnvSuffix)(database)}_WRITE_URI`;
+exports.prismaDatasourceWriteEnvVar = prismaDatasourceWriteEnvVar;
+const prismaDatasourceMigrationEnvVar = (database) => database === 'main'
+    ? 'DATABASE_MAIN_MIGRATION_URI'
+    : `DATABASE_${(0, exports.databaseNameToEnvSuffix)(database)}_MIGRATION_URI`;
+exports.prismaDatasourceMigrationEnvVar = prismaDatasourceMigrationEnvVar;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWJhc2VNZXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3Byb2plY3RzR2VuZXJhdGlvbi91dGlscy9kYXRhYmFzZU1ldGEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkNBQXFDO0FBSXJDLE1BQU0sdUJBQXVCLEdBQUcscUJBQXFCLENBQUE7QUFFOUMsTUFBTSx1QkFBdUIsR0FBRyxDQUFDLFVBQWtCLEVBQVUsRUFBRSxDQUNwRSxVQUFVLEtBQUssTUFBTSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLElBQUEsdUJBQVMsRUFBQyxVQUFVLENBQUMsQ0FBQTtBQUQvQyxRQUFBLHVCQUF1QiwyQkFDd0I7QUFFckQsTUFBTSwwQkFBMEIsR0FBRyxDQUFDLElBQVksRUFBUSxFQUFFO0lBQy9ELElBQUksSUFBSSxLQUFLLE1BQU0sRUFBRTtRQUNuQixPQUFNO0tBQ1A7SUFDRCxJQUFJLENBQUMsdUJBQXVCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFO1FBQ3ZDLE1BQU0sSUFBSSxLQUFLLENBQ2IsMEJBQTBCLElBQUksc0RBQXNELHVCQUF1QixHQUFHLENBQy9HLENBQUE7S0FDRjtBQUNILENBQUMsQ0FBQTtBQVRZLFFBQUEsMEJBQTBCLDhCQVN0QztBQUVELDBGQUEwRjtBQUNuRixNQUFNLG9DQUFvQyxHQUFHLENBQ2xELE1BQWMsRUFDRCxFQUFFO0lBQ2YsTUFBTSxTQUFTLEdBQUcsZ0JBQWdCLE1BQU0sR0FBRyxDQUFBO0lBQzNDLE1BQU0sV0FBVyxHQUFHLGlEQUFpRCxJQUFBLCtCQUF1QixFQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUE7SUFDdEcsT0FBTztRQUNMO1lBQ0UsSUFBSSxFQUFFLFlBQVksTUFBTSxZQUFZO1lBQ3BDLElBQUksRUFBRSxRQUFpQjtZQUN2QixRQUFRLEVBQUUsSUFBSTtZQUNkLE9BQU8sRUFBRSxXQUFXO1lBQ3BCLE9BQU8sRUFBRSxHQUFHLFNBQVMsaUNBQWlDO1lBQ3RELE1BQU0sRUFBRSxDQUFDLE1BQU0sRUFBRSxRQUFRLEVBQUUsYUFBYSxDQUFDO1lBQ3pDLE1BQU0sRUFBRSxJQUFJO1lBQ1osUUFBUSxFQUFFLEtBQUs7U0FDaEI7UUFDRDtZQUNFLElBQUksRUFBRSxZQUFZLE1BQU0sZUFBZTtZQUN2QyxJQUFJLEVBQUUsUUFBaUI7WUFDdkIsUUFBUSxFQUFFLEtBQUs7WUFDZixPQUFPLEVBQUUsV0FBVztZQUNwQixPQUFPLEVBQUUsR0FBRyxTQUFTLHdDQUF3QztZQUM3RCxNQUFNLEVBQUUsQ0FBQyxNQUFNLEVBQUUsUUFBUSxFQUFFLGFBQWEsQ0FBQztZQUN6QyxNQUFNLEVBQUUsSUFBSTtZQUNaLFFBQVEsRUFBRSxLQUFLO1NBQ2hCO1FBQ0Q7WUFDRSxJQUFJLEVBQUUsWUFBWSxNQUFNLG1CQUFtQjtZQUMzQyxJQUFJLEVBQUUsTUFBZTtZQUNyQixRQUFRLEVBQUUsSUFBSTtZQUNkLE9BQU8sRUFBRSxLQUFLO1lBQ2QsT0FBTyxFQUFFLEdBQUcsU0FBUyxnREFBZ0Q7WUFDckUsTUFBTSxFQUFFLENBQUMsTUFBTSxFQUFFLFFBQVEsRUFBRSxhQUFhLENBQUM7WUFDekMsTUFBTSxFQUFFLEtBQUs7WUFDYixRQUFRLEVBQUUsSUFBSTtTQUNmO1FBQ0Q7WUFDRSxJQUFJLEVBQUUsWUFBWSxNQUFNLGdCQUFnQjtZQUN4QyxJQUFJLEVBQUUsUUFBaUI7WUFDdkIsUUFBUSxFQUFFLElBQUk7WUFDZCxPQUFPLEVBQUUsV0FBVztZQUNwQixPQUFPLEVBQUUsR0FBRyxTQUFTLG1EQUFtRDtZQUN4RSxNQUFNLEVBQUUsQ0FBQyxNQUFNLEVBQUUsUUFBUSxFQUFFLGFBQWEsQ0FBQztZQUN6QyxNQUFNLEVBQUUsSUFBSTtZQUNaLFFBQVEsRUFBRSxLQUFLO1NBQ2hCO0tBQ3dCLENBQUE7QUFDN0IsQ0FBQyxDQUFBO0FBL0NZLFFBQUEsb0NBQW9DLHdDQStDaEQ7QUFFTSxNQUFNLHVCQUF1QixHQUFHLENBQUMsTUFBYyxFQUFVLEVBQUUsQ0FDaEUsTUFBTSxDQUFDLE9BQU8sQ0FBQyxXQUFXLEVBQUUsS0FBSyxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQTtBQUR2RCxRQUFBLHVCQUF1QiwyQkFDZ0M7QUFFN0QsTUFBTSwyQkFBMkIsR0FBRyxDQUFDLFFBQWdCLEVBQVUsRUFBRSxDQUN0RSxRQUFRLEtBQUssTUFBTTtJQUNqQixDQUFDLENBQUMseUJBQXlCO0lBQzNCLENBQUMsQ0FBQyxZQUFZLElBQUEsK0JBQXVCLEVBQUMsUUFBUSxDQUFDLFlBQVksQ0FBQTtBQUhsRCxRQUFBLDJCQUEyQiwrQkFHdUI7QUFFeEQsTUFBTSwrQkFBK0IsR0FBRyxDQUFDLFFBQWdCLEVBQVUsRUFBRSxDQUMxRSxRQUFRLEtBQUssTUFBTTtJQUNqQixDQUFDLENBQUMsNkJBQTZCO0lBQy9CLENBQUMsQ0FBQyxZQUFZLElBQUEsK0JBQXVCLEVBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFBO0FBSHRELFFBQUEsK0JBQStCLG1DQUd1QiJ9

package/build/types/projectsGeneration/builders/BaseSavableEntityBuilder.d.ts

@@ -24,6 +24,7 @@ declare abstract class BaseSavableEntityBuilder extends BaseBuilder implements M
     singleKey: boolean;
     logging: boolean;
     auditable: boolean;
+    cacheable: boolean;
     creatableByUser: boolean;
     updatableByUser: boolean;
     removableByUser: boolean;
@@ -47,6 +48,7 @@ declare abstract class BaseSavableEntityBuilder extends BaseBuilder implements M
     }>;
     externalSearchName: string | undefined;
     sharded: boolean;
+    database: string;
     isExternalSearch: boolean;
     clearDBAfter: {
         count: number;
@@ -73,6 +75,7 @@ declare abstract class BaseSavableEntityBuilder extends BaseBuilder implements M
     setAuditable(auditable?: boolean): this;
     setDeletable(deletable?: boolean): this;
     setEditable(editable?: boolean): this;
+    setCacheable(cacheable?: boolean): this;
     setCreatableByUser(creatableByUser?: boolean): this;
     setUpdatableByUser(updatableByUser?: boolean): this;
     setRemovableByUser(removableByUser?: boolean): this;
@@ -124,6 +127,7 @@ declare abstract class BaseSavableEntityBuilder extends BaseBuilder implements M
     setDevPredefinedElements(fields: Record<string, any>[]): void;
     setMultitenancy(multitenancy: Multitenancy, commonElementsVisibleToAll?: boolean): void;
     setSharded(value?: boolean): this;
+    setDatabase(name: string): this;
     setIsExternalTable(): this;
     setClearDBAfter(count: number, unit: DateUnit): this;
     setAllowedToChange(value?: string): this;

package/build/types/projectsGeneration/builders/SystemMetaBuilder.d.ts

@@ -46,6 +46,7 @@ declare class SystemMetaBuilder implements MethodsModelsHolder {
     protected outputModels: BaseModelBuilder[];
     labels: string[];
     additionalServices: AdditionalServiceBuilder[];
+    private readonly registeredDatabaseNames;
     name: string;
     prefix: string;
     needFor?: string;
@@ -94,6 +95,7 @@ declare class SystemMetaBuilder implements MethodsModelsHolder {
     addExternalMenuItem(label: string, url: string): ExternalMenuItemBuilder;
     addExternalEnvMenuItem(label: string, env: string): ExternalEnvMenuItemBuilder;
     getBack(): DeploymentBuilder;
+    addDatabase(name: string): this;
     getDocuments(): EntityBuilderWithOptions<DocumentBuilder>[];
     addDocument(name: string, title?: {
         singular?: string;

package/build/types/projectsGeneration/builders/buildedTypes.d.ts

@@ -18,6 +18,9 @@ export interface Glossary {
     term: string;
     definition: string;
 }
+export type DataBaseMeta = {
+    name: string;
+};
 export type ProjectCategory = 'back' | 'ui' | 'app' | 'land';
 export interface Command {
     projectCategory: ProjectCategory;
@@ -119,7 +122,8 @@ export declare enum StringType {
 }
 export declare enum IndexType {
     BTree = "bTree",
-    Hash = "hash"
+    Hash = "hash",
+    Gin = "gin"
 }
 export type PlainStringField = BaseStringField & {
     stringType: 'plain';
@@ -236,6 +240,8 @@ export type BaseSavableEntity = BaseEntity & {
     methods: ServiceMethod[];
     labels: string[];
     excludeFromCommonMenu: boolean;
+    cacheable: boolean;
+    database: string;
 };
 export type Report = BaseEntity & {
     type: 'report';
@@ -243,6 +249,7 @@ export type Report = BaseEntity & {
 };
 export type Document = BaseSavableEntity & {
     type: 'document';
+    cacheable: boolean;
     deletable: boolean;
     editable: boolean;
     registries: string[];
@@ -252,6 +259,7 @@ export type Catalog = BaseSavableEntity & {
     type: 'catalog';
     deletable: boolean;
     editable: boolean;
+    cacheable: boolean;
 };
 export type TsModel = BaseEntity & {
     fields: TsModelField[];
@@ -389,6 +397,7 @@ export type InfoRegistryPeriod = 'notPeriodic' | 'second' | 'day' | 'month' | 'y
 export type InfoRegistry = BaseSavableEntity & {
     type: 'infoRegistry';
     registrarDepended: boolean;
+    cacheable: boolean;
     dimensions: Field[];
     resources: Field[];
     period: InfoRegistryPeriod;
@@ -396,6 +405,7 @@ export type InfoRegistry = BaseSavableEntity & {
 export type SumRegistry = BaseSavableEntity & {
     type: 'sumRegistry';
     registrarDepended: boolean;
+    cacheable: boolean;
     dimensions: Field[];
     resources: Field[];
 };
@@ -421,6 +431,7 @@ export type System = {
     prefix: string;
     needFor?: string;
     configVars: ConfigVar[];
+    dataBases: DataBaseMeta[];
     catalogs: Catalog[];
     documents: Document[];
     infoRegistries: InfoRegistry[];

package/build/types/projectsGeneration/generators/fileTemplates/back/environment/src/clients/getPrisma.d.ts

@@ -1,2 +1,2 @@
-import { BootstrapEntityOptions } from '../../../../../../types';
-export declare const prismaGetterTmpl: (_options?: BootstrapEntityOptions) => string;
+import { ProjectWideGenerationArgs } from '../../../../../../args';
+export declare const prismaGetterTmpl: (args: ProjectWideGenerationArgs) => string;

package/build/types/projectsGeneration/generators/prisma/scheme/genPrismaEntity.d.ts

@@ -1,3 +1,3 @@
 import { Entity } from '../../../builders';
 import { LinkedEntities } from '../../../types';
-export declare const genPrismaEntity: (entity: Entity, links: LinkedEntities[], forShards?: boolean) => string;
+export declare const genPrismaEntity: (entity: Entity, links: LinkedEntities[], forShards?: boolean, allEntities?: Map<string, Entity>) => string;

package/build/types/projectsGeneration/generators/prisma/scheme/genPrismaSchemaForEntities.d.ts

@@ -1,3 +1,3 @@
 import { Entity } from '../../../builders';
 import { LinkedEntities } from '../../../types';
-export declare const genPrismaSchemaForEntities: (entities: Entity[], links: LinkedEntities[], forShards?: boolean) => string;
+export declare const genPrismaSchemaForEntities: (entities: Entity[], links: LinkedEntities[], forShards?: boolean, allEntities?: Map<string, Entity>) => string;

package/build/types/projectsGeneration/generators/prisma/scheme/genPrismaSchemaForEntitiesWithClientAdnDb.d.ts

@@ -1,2 +1,13 @@
 import { ProjectWideGenerationArgs } from '../../../args';
-export declare const genPrismaSchemaForEntitiesWithClientAdnDb: ({ entities, allLinks, }: ProjectWideGenerationArgs, forShards?: boolean) => string;
+export type GenPrismaSchemaDbOptions = {
+    /** Logical database key; `main` uses legacy paths and split by sharding. */
+    database: string;
+    /**
+     * When `database === 'main'`, same as today: shard vs non-shard models.
+     * For `database !== 'main'`, callers must pass `false` (sharding ignored).
+     */
+    forShards: boolean;
+};
+export declare const genPrismaSchemaForEntitiesWithClientAdnDb: (args: ProjectWideGenerationArgs, opts: GenPrismaSchemaDbOptions) => string;
+/** Minimal deploy schema (migrate URL only). */
+export declare const genDeployConnectionPrisma: (database: string) => string;

package/build/types/projectsGeneration/utils/databaseMeta.d.ts

@@ -0,0 +1,8 @@
+import { ConfigVar } from '../builders/buildedTypes';
+export declare const postgresUrlDatabaseName: (metaDbName: string) => string;
+export declare const validateEntityDatabaseName: (name: string) => void;
+/** Config vars for a non-main database (mirrors database.main.* in SystemMetaBuilder). */
+export declare const buildConfigVarsForAdditionalDatabase: (dbName: string) => ConfigVar[];
+export declare const databaseNameToEnvSuffix: (dbName: string) => string;
+export declare const prismaDatasourceWriteEnvVar: (database: string) => string;
+export declare const prismaDatasourceMigrationEnvVar: (database: string) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runlify",
-  "version": "0.0.778",
+  "version": "0.0.782",
   "description": "runlify CLI",
   "private": false,
   "main": "build/index.js",