@pylonts/dsl 1.1.2 → 1.1.4

package/dist/bases.d.ts

@@ -3,7 +3,7 @@ import type { DtoMessage, ImportBase, ImportRef } from './dto.js';
 export declare const PageRequest: ImportBase;
 /** Paginated list response base — renders `import { PageResult } from '@pylonts/core'` + `PageResult(<row>)` */
 export declare const PageResult: (row: DtoMessage) => ImportRef;
-/** Paged rows type base without generic args — renders `import { PagedRows } from '@pylonts/core'` */
+/** Paged rows type base without generic args — renders `import type { PagedRows } from '@pylonts/core'` */
 export declare const PagedRows: ImportBase;
 /** Paged rows type base — renders `import { PagedRows } from '@pylonts/core'` + `PagedRows(<row>)` */
 export declare const PageRows: (row: DtoMessage) => ImportRef;

package/dist/bases.js

@@ -14,8 +14,8 @@ export const PageResult = (row) => ({
     name: 'PageResult',
     args: [row],
 });
-/** Paged rows type base without generic args — renders `import { PagedRows } from '@pylonts/core'` */
-export const PagedRows = { from: '@pylonts/core', name: 'PagedRows' };
+/** Paged rows type base without generic args — renders `import type { PagedRows } from '@pylonts/core'` */
+export const PagedRows = { from: '@pylonts/core', name: 'PagedRows', type: true };
 /** Paged rows type base — renders `import { PagedRows } from '@pylonts/core'` + `PagedRows(<row>)` */
 export const PageRows = (row) => ({
     from: '@pylonts/core',

package/dist/convert.d.ts

@@ -1,9 +1,12 @@
 import type { SchemaBase } from './dsl.js';
+import type { FrontAppSchema } from './project.js';
 /** Declares post-call result → page data field mapping.
  *  Driver generates per-item transform (e.g. .map()) before setData. */
 export interface ConvertSchema extends SchemaBase {
     type: 'convert';
+    /** The frontend app this convert belongs to (shared instance from project.config). */
+    app: FrontAppSchema;
     /** { targetField: sourceField } — renames or copies fields from call result. */
     fields: Record<string, string>;
 }
-export declare function defineConvert(name: string, fields: Record<string, string>): ConvertSchema;
+export declare function defineConvert(name: string, app: FrontAppSchema, fields: Record<string, string>): ConvertSchema;

package/dist/convert.js

@@ -1,3 +1,3 @@
-export function defineConvert(name, fields) {
-    return { name, type: 'convert', fields };
+export function defineConvert(name, app, fields) {
+    return { name, type: 'convert', app, fields };
 }

package/dist/dao.d.ts

@@ -0,0 +1,9 @@
+import { SchemaBase } from './dsl.js';
+import { FrontAppSchema } from './project.js';
+/** A data-access layer bound to exactly one frontend app. */
+export interface DaoSchema extends SchemaBase {
+    type: 'dao';
+    /** The frontend app this DAO belongs to (shared instance from project.config). */
+    app: FrontAppSchema;
+}
+export declare function defineDao(name: string, app: FrontAppSchema, description?: string): DaoSchema;

package/dist/dao.js

@@ -0,0 +1,3 @@
+export function defineDao(name, app, description) {
+    return { name, type: 'dao', app, description };
+}

package/dist/db.d.ts

@@ -11,7 +11,7 @@ export type ForeignKey = {
 };
 export interface TableSchemaOptions<N extends string = string, C extends Record<string, Field> = Record<string, Field>, E extends Record<string, EnumDef> = Record<string, EnumDef>> {
     description?: string;
-    paginated?: boolean;
+    paginated: boolean;
     actor?: boolean;
     generator?: string;
     autoIncrement?: Field;
@@ -31,7 +31,7 @@ export declare class TableSchema<N extends string = string, C extends Record<str
     name: N;
     description?: string;
     /** 分页 */
-    paginated?: boolean;
+    paginated: boolean;
     /** 系统操作者（如小程序为 C 端用户，管理端为运营） */
     actor?: boolean;
     /** id 生成器 */

package/dist/db.js

@@ -27,6 +27,9 @@ export class TableSchema {
         if (!options.enums) {
             throw new Error(`table '${name}': enums is required — declare enums: {} when the table has no enums`);
         }
+        if (options.paginated === undefined || options.paginated === null) {
+            throw new Error(`table '${name}': paginated is required — discuss with user whether this table needs pagination, then set paginated: true or paginated: false`);
+        }
         this.name = name;
         this.description = options.description;
         this.paginated = options.paginated;
@@ -68,9 +71,24 @@ export function defineTable(name, schema) {
         table.columns[key].name = key;
         table.columns[key].schema = table;
     }
+    if (table.primaryKey) {
+        const pkFields = Array.isArray(table.primaryKey) ? table.primaryKey : [table.primaryKey];
+        const colRefs = Object.values(table.columns);
+        for (const pk of pkFields) {
+            if (!colRefs.includes(pk)) {
+                throw new Error(`table '${name}': primaryKey field '${pk.name}' must be the exact same object as the corresponding column (extract it to a const and reuse)`);
+            }
+        }
+    }
     for (const [fkName, fk] of Object.entries(table.foreignKeys ?? {})) {
         const refs = Array.isArray(fk.references) ? fk.references : [fk.references];
         const fields = Array.isArray(fk.columns) ? fk.columns : [fk.columns];
+        const colRefs = Object.values(table.columns);
+        for (const fkField of fields) {
+            if (!colRefs.includes(fkField)) {
+                throw new Error(`foreign key ${fkName}: column '${fkField.name}' must be the exact same object as the corresponding column in the table (extract it to a const and reuse)`);
+            }
+        }
         for (let i = 0; i < refs.length; i++) {
             const ref = refs[i];
             if (!ref.schema)
@@ -89,11 +107,16 @@ export function defineTable(name, schema) {
     }
     for (const [idxKey, index] of Object.entries(table.indexes ?? {})) {
         const cols = Array.isArray(index.columns) ? index.columns : [index.columns];
+        const colRefs = Object.values(table.columns);
         for (const col of cols) {
             if (typeof col !== 'object' || col === null || typeof col.type !== 'string') {
                 const idxName = index.name ?? idxKey;
                 throw new Error(`index ${idxName}: columns must be Field instances (stringField()/intField()/...), got ${JSON.stringify(col)}`);
             }
+            if (!colRefs.includes(col)) {
+                const idxName = index.name ?? idxKey;
+                throw new Error(`index ${idxName}: column '${col.name}' must be the exact same object as the corresponding column in the table (extract it to a const and reuse)`);
+            }
         }
     }
     return table;

package/dist/index.d.ts

@@ -21,6 +21,8 @@ export * from './component.js';
 export * from './convert.js';
 export * from './ref.js';
 export * from './route.js';
+export * from './service.js';
+export * from './dao.js';
 export * from './page.js';
 export * from './curd.js';
 export * from './page-flow.js';

package/dist/index.js

@@ -21,6 +21,8 @@ export * from './component.js';
 export * from './convert.js';
 export * from './ref.js';
 export * from './route.js';
+export * from './service.js';
+export * from './dao.js';
 export * from './page.js';
 export * from './curd.js';
 export * from './page-flow.js';

package/dist/service.d.ts

@@ -0,0 +1,16 @@
+import { SchemaBase } from './dsl.js';
+import { FrontAppSchema } from './project.js';
+import type { DtoArrayField, DtoField, DtoMessage, DtoObjectField } from './dto.js';
+/** A frontend service bound to exactly one frontend app. */
+export interface ServiceSchema extends SchemaBase {
+    type: 'service';
+    /** The frontend app this service belongs to (shared instance from project.config). */
+    app: FrontAppSchema;
+}
+export declare function defineService(name: string, app: FrontAppSchema, description?: string): ServiceSchema;
+/** A method exposed by a service. */
+export interface ServiceMethodSchema extends SchemaBase {
+    type: 'method';
+    name: string;
+    fields: Record<string, DtoField | DtoMessage | DtoArrayField | DtoObjectField>;
+}

package/dist/service.js

@@ -0,0 +1,3 @@
+export function defineService(name, app, description) {
+    return { name, type: 'service', app, description };
+}

package/dist/utils.d.ts

@@ -2,3 +2,12 @@
 export declare function toCamelCase(name: string): string;
 /** snake_case → PascalCase: mer_id → MerId */
 export declare function toPascalCase(snake: string): string;
+import { SchemaBase } from './dsl.js';
+import { FrontAppSchema } from './project.js';
+/** A utility module bound to exactly one frontend app. */
+export interface UtilsSchema extends SchemaBase {
+    type: 'utils';
+    /** The frontend app this utility module belongs to (shared instance from project.config). */
+    app: FrontAppSchema;
+}
+export declare function defineUtils(name: string, app: FrontAppSchema, description?: string): UtilsSchema;

package/dist/utils.js

@@ -7,3 +7,6 @@ export function toCamelCase(name) {
 export function toPascalCase(snake) {
     return snake.replace(/(^|_)([a-z])/g, (_m, _p, c) => c.toUpperCase());
 }
+export function defineUtils(name, app, description) {
+    return { name, type: 'utils', app, description };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pylonts/dsl",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Schema definition DSL with drivers: MySQL DDL, TS enum, TypeBox schema codegen.",
   "type": "module",
   "main": "src/index.ts",

package/src/bases.ts

@@ -1,30 +1,30 @@
-import type { DtoMessage, ImportBase, ImportRef } from './dto.js';
-
-// Named base-schema references for common protocol DTOs.
-//
-// These are ImportRef metadata (not re-exports of the actual TypeBox schemas):
-// the DSL stores { from, name } so the generator can emit the import line and
-// the identifier — the runtime schema object itself is never loaded by the DSL.
-//
-// `import { PageRequest } from '@pylonts/dsl'` therefore gives .include() an
-// already-resolved reference — no static analysis or name lookup needed.
-
-/** Paginated query request base — renders `import { PageRequest } from '@pylonts/core'` + Intersect */
-export const PageRequest: ImportBase = { from: '@pylonts/core', name: 'PageRequest' };
-
-/** Paginated list response base — renders `import { PageResult } from '@pylonts/core'` + `PageResult(<row>)` */
-export const PageResult = (row: DtoMessage): ImportRef => ({
-  from: '@pylonts/core',
-  name: 'PageResult',
-  args: [row],
-});
-
-/** Paged rows type base without generic args — renders `import { PagedRows } from '@pylonts/core'` */
-export const PagedRows: ImportBase = { from: '@pylonts/core', name: 'PagedRows' };
-
-/** Paged rows type base — renders `import { PagedRows } from '@pylonts/core'` + `PagedRows(<row>)` */
-export const PageRows = (row: DtoMessage): ImportRef => ({
-  from: '@pylonts/core',
-  name: 'PagedRows',
-  args: [row],
+import type { DtoMessage, ImportBase, ImportRef } from './dto.js';
+
+// Named base-schema references for common protocol DTOs.
+//
+// These are ImportRef metadata (not re-exports of the actual TypeBox schemas):
+// the DSL stores { from, name } so the generator can emit the import line and
+// the identifier — the runtime schema object itself is never loaded by the DSL.
+//
+// `import { PageRequest } from '@pylonts/dsl'` therefore gives .include() an
+// already-resolved reference — no static analysis or name lookup needed.
+
+/** Paginated query request base — renders `import { PageRequest } from '@pylonts/core'` + Intersect */
+export const PageRequest: ImportBase = { from: '@pylonts/core', name: 'PageRequest' };
+
+/** Paginated list response base — renders `import { PageResult } from '@pylonts/core'` + `PageResult(<row>)` */
+export const PageResult = (row: DtoMessage): ImportRef => ({
+  from: '@pylonts/core',
+  name: 'PageResult',
+  args: [row],
+});
+
+/** Paged rows type base without generic args — renders `import type { PagedRows } from '@pylonts/core'` */
+export const PagedRows: ImportBase = { from: '@pylonts/core', name: 'PagedRows', type: true };
+
+/** Paged rows type base — renders `import { PagedRows } from '@pylonts/core'` + `PagedRows(<row>)` */
+export const PageRows = (row: DtoMessage): ImportRef => ({
+  from: '@pylonts/core',
+  name: 'PagedRows',
+  args: [row],
 });

package/src/convert.ts

@@ -1,13 +1,16 @@
 import type { SchemaBase } from './dsl.js';
+import type { FrontAppSchema } from './project.js';
 
 /** Declares post-call result → page data field mapping.
  *  Driver generates per-item transform (e.g. .map()) before setData. */
 export interface ConvertSchema extends SchemaBase {
   type: 'convert';
+  /** The frontend app this convert belongs to (shared instance from project.config). */
+  app: FrontAppSchema;
   /** { targetField: sourceField } — renames or copies fields from call result. */
   fields: Record<string, string>;
 }
 
-export function defineConvert(name: string, fields: Record<string, string>): ConvertSchema {
-  return { name, type: 'convert', fields };
-}
+export function defineConvert(name: string, app: FrontAppSchema, fields: Record<string, string>): ConvertSchema {
+  return { name, type: 'convert', app, fields };
+}

package/src/dao.ts

@@ -0,0 +1,13 @@
+import { SchemaBase } from './dsl.js';
+import { FrontAppSchema } from './project.js';
+
+/** A data-access layer bound to exactly one frontend app. */
+export interface DaoSchema extends SchemaBase {
+  type: 'dao';
+  /** The frontend app this DAO belongs to (shared instance from project.config). */
+  app: FrontAppSchema;
+}
+
+export function defineDao(name: string, app: FrontAppSchema, description?: string): DaoSchema {
+  return { name, type: 'dao', app, description };
+}

package/src/db.ts

@@ -21,7 +21,7 @@ export interface TableSchemaOptions<
   E extends Record<string, EnumDef> = Record<string, EnumDef>
 > {
   description?: string;
-  paginated?: boolean;
+  paginated: boolean;
   actor?: boolean;
   generator?: string;
   autoIncrement?: Field;
@@ -46,7 +46,7 @@ export class TableSchema<
   name: N;
   description?: string;
   /** 分页 */
-  paginated?: boolean;
+  paginated: boolean;
   /** 系统操作者（如小程序为 C 端用户，管理端为运营） */
   actor?: boolean;
   /** id 生成器 */
@@ -69,6 +69,9 @@ export class TableSchema<
     if (!options.enums) {
       throw new Error(`table '${name}': enums is required — declare enums: {} when the table has no enums`);
     }
+    if (options.paginated === undefined || options.paginated === null) {
+      throw new Error(`table '${name}': paginated is required — discuss with user whether this table needs pagination, then set paginated: true or paginated: false`);
+    }
     this.name = name;
     this.description = options.description;
     this.paginated = options.paginated;
@@ -120,9 +123,28 @@ export function defineTable<
     table.columns[key].name = key;
     table.columns[key].schema = table;
   }
+  if (table.primaryKey) {
+    const pkFields = Array.isArray(table.primaryKey) ? table.primaryKey : [table.primaryKey];
+    const colRefs = Object.values(table.columns);
+    for (const pk of pkFields) {
+      if (!colRefs.includes(pk)) {
+        throw new Error(
+          `table '${name}': primaryKey field '${pk.name}' must be the exact same object as the corresponding column (extract it to a const and reuse)`,
+        );
+      }
+    }
+  }
   for (const [fkName, fk] of Object.entries(table.foreignKeys ?? {})) {
     const refs = Array.isArray(fk.references) ? fk.references : [fk.references];
     const fields = Array.isArray(fk.columns) ? fk.columns : [fk.columns];
+    const colRefs = Object.values(table.columns);
+    for (const fkField of fields) {
+      if (!colRefs.includes(fkField)) {
+        throw new Error(
+          `foreign key ${fkName}: column '${fkField.name}' must be the exact same object as the corresponding column in the table (extract it to a const and reuse)`,
+        );
+      }
+    }
     for (let i = 0; i < refs.length; i++) {
       const ref = refs[i];
       if (!ref.schema) throw new Error(`foreign key ${fkName}: references field has no schema`);
@@ -140,6 +162,7 @@ export function defineTable<
   }
   for (const [idxKey, index] of Object.entries(table.indexes ?? {})) {
     const cols = Array.isArray(index.columns) ? index.columns : [index.columns];
+    const colRefs = Object.values(table.columns);
     for (const col of cols) {
       if (typeof col !== 'object' || col === null || typeof (col as Field).type !== 'string') {
         const idxName = index.name ?? idxKey;
@@ -147,6 +170,12 @@ export function defineTable<
           `index ${idxName}: columns must be Field instances (stringField()/intField()/...), got ${JSON.stringify(col)}`,
         );
       }
+      if (!colRefs.includes(col)) {
+        const idxName = index.name ?? idxKey;
+        throw new Error(
+          `index ${idxName}: column '${col.name}' must be the exact same object as the corresponding column in the table (extract it to a const and reuse)`,
+        );
+      }
     }
   }
   return table;

package/src/index.ts

@@ -21,6 +21,8 @@ export * from './component.js';
 export * from './convert.js';
 export * from './ref.js';
 export * from './route.js';
+export * from './service.js';
+export * from './dao.js';
 export * from './page.js';
 export * from './curd.js';
 export * from './page-flow.js';

package/src/service.ts

@@ -0,0 +1,21 @@
+import { SchemaBase } from './dsl.js';
+import { FrontAppSchema } from './project.js';
+import type { DtoArrayField, DtoField, DtoMessage, DtoObjectField } from './dto.js';
+
+/** A frontend service bound to exactly one frontend app. */
+export interface ServiceSchema extends SchemaBase {
+  type: 'service';
+  /** The frontend app this service belongs to (shared instance from project.config). */
+  app: FrontAppSchema;
+}
+
+export function defineService(name: string, app: FrontAppSchema, description?: string): ServiceSchema {
+  return { name, type: 'service', app, description };
+}
+
+/** A method exposed by a service. */
+export interface ServiceMethodSchema extends SchemaBase {
+  type: 'method';
+  name: string;
+  fields: Record<string, DtoField | DtoMessage | DtoArrayField | DtoObjectField>;
+}

package/src/utils.ts

@@ -1,11 +1,27 @@
-// ── naming conversions ──
-
-/** snake_case → camelCase: mer_id → merId; names without underscores are unchanged */
-export function toCamelCase(name: string): string {
-  return name.replace(/_([a-z])/g, (_, c: string) => c.toUpperCase());
-}
-
-/** snake_case → PascalCase: mer_id → MerId */
-export function toPascalCase(snake: string): string {
-  return snake.replace(/(^|_)([a-z])/g, (_m, _p, c: string) => c.toUpperCase());
+// ── naming conversions ──
+
+/** snake_case → camelCase: mer_id → merId; names without underscores are unchanged */
+export function toCamelCase(name: string): string {
+  return name.replace(/_([a-z])/g, (_, c: string) => c.toUpperCase());
+}
+
+/** snake_case → PascalCase: mer_id → MerId */
+export function toPascalCase(snake: string): string {
+  return snake.replace(/(^|_)([a-z])/g, (_m, _p, c: string) => c.toUpperCase());
+}
+
+// ── schema ──
+
+import { SchemaBase } from './dsl.js';
+import { FrontAppSchema } from './project.js';
+
+/** A utility module bound to exactly one frontend app. */
+export interface UtilsSchema extends SchemaBase {
+  type: 'utils';
+  /** The frontend app this utility module belongs to (shared instance from project.config). */
+  app: FrontAppSchema;
+}
+
+export function defineUtils(name: string, app: FrontAppSchema, description?: string): UtilsSchema {
+  return { name, type: 'utils', app, description };
 }