@pylonts/dsl 1.1.12 → 1.1.14

package/dist/flow.js

@@ -20,7 +20,8 @@ export function defineSlots(slots) {
                     prop in target) {
                     return Reflect.get(target, prop, receiver);
                 }
-                const fields = target.type?.fields;
+                const typeObj = target.type;
+                const fields = slotFields(typeObj);
                 if (fields !== undefined && Object.prototype.hasOwnProperty.call(fields, prop)) {
                     return { slot: proxy, field: fields[prop] };
                 }
@@ -48,7 +49,7 @@ export function defineSlots(slots) {
 // unreachable via dot access (slots.args.type reads the message, not the
 // field) — warn instead of failing: the field may never be needed.
 function warnShadowedFields(slot) {
-    const fields = slot.type?.fields;
+    const fields = slotFields(slot.type);
     if (fields === undefined)
         return;
     const shadowed = ['type', 'name', 'description'].filter((k) => k in fields);
@@ -56,6 +57,19 @@ function warnShadowedFields(slot) {
         console.warn(`slot "${slot.name}": message fields ${shadowed.join(', ')} are shadowed by slot metadata and unreachable via field access`);
     }
 }
+/** Field map of a slot's declared type: dto/third messages carry `fields`,
+ *  entity rows carry `columns` (named Fields). */
+function slotFields(type) {
+    if (typeof type !== 'object' || type === null)
+        return undefined;
+    const t = type;
+    if (t.fields !== undefined)
+        return t.fields;
+    if (t.columns !== undefined) {
+        return Object.fromEntries(t.columns.map((c) => [c.name, c]));
+    }
+    return undefined;
+}
 export function invoke(method, options = {}) {
     return { method, args: options.args, result: options.result };
 }
@@ -66,7 +80,22 @@ export function isCall(m) {
 export function methodOf(m) {
     return isCall(m) ? m.method : m;
 }
+/** True when the condition operand is the slot itself (slot-level null check),
+ *  not a field access on it. Slot metadata (name) lives on the proxy target and
+ *  reads without field interception; a field access resolves to { slot, field }. */
+export function isFlowSlot(v) {
+    return typeof v === 'object' && v !== null && typeof v.name === 'string';
+}
 function comparison(op, field, value) {
+    if (isFlowSlot(field)) {
+        if (op !== 'isNull' && op !== 'isNotNull') {
+            throw new Error(`${op}: a slot-level check only supports isNull/isNotNull — field comparisons need slots.args.amt`);
+        }
+        if (value !== undefined) {
+            throw new Error(`${op}: takes no value`);
+        }
+        return { kind: 'comparison', op, field, value };
+    }
     const ref = field;
     if (typeof ref !== 'object' || ref === null || typeof ref.slot !== 'object' || typeof ref.field !== 'object') {
         throw new Error(`${op}: field must be a slot field access like slots.args.amt`);
@@ -471,6 +500,16 @@ function validateGuardChecks(schema) {
 const COMPARE_OPS = ['lt', 'le', 'gt', 'ge', 'eq', 'ne', 'isNull', 'isNotNull'];
 function validateCondition(where, c) {
     if (!isCall(c)) {
+        if (isFlowSlot(c.field)) {
+            const nullOp = c.op === 'isNull' || c.op === 'isNotNull';
+            if (!nullOp) {
+                throw new Error(`${where}: a slot-level check only supports isNull/isNotNull`);
+            }
+            if (c.value !== undefined) {
+                throw new Error(`${where}: ${c.op} takes no value`);
+            }
+            return;
+        }
         const f = c.field;
         if (typeof f !== 'object' || f === null || typeof f.slot !== 'object' || typeof f.field !== 'object') {
             throw new Error(`${where}: ${c.op} field must be a slot field access like slots.args.amt`);
@@ -502,10 +541,11 @@ function validateCondition(where, c) {
         throw new Error(`${where}: a predicate call cannot bind a result slot`);
     }
 }
-/** Slots a condition reads: a comparison's field slot or a predicate call's arg slots. */
+/** Slots a condition reads: a comparison's field slot (or the slot itself for
+ *  slot-level checks) or a predicate call's arg slots. */
 function conditionSlots(c) {
     if (!isCall(c))
-        return [c.field.slot];
+        return [isFlowSlot(c.field) ? c.field : c.field.slot];
     return c.args ?? [];
 }
 // ifNode rules: at least one case, every condition well-formed, and targets

package/dist/mermaid-driver.js

@@ -1,4 +1,4 @@
-import { isCall, methodOf } from './flow.js';
+import { isCall, isFlowSlot, methodOf } from './flow.js';
 // Mermaid driver: converts a FlowSchema into a Mermaid flowchart (TD).
 // Node ids are hierarchical (n0, n0_0, n0_0_0, ...) so nested sub-flows stay
 // globally unique. A node with a sub-flow renders as a subgraph block whose
@@ -215,7 +215,7 @@ function renderDataLine(n, outgoing) {
         if (c === undefined)
             return;
         if (!isCall(c)) {
-            reads.add(c.field.slot.name);
+            reads.add(isFlowSlot(c.field) ? c.field.name : c.field.slot.name);
             return;
         }
         for (const t of c.args ?? [])

package/dist/service.d.ts

@@ -1,17 +1,20 @@
-import type { SchemaBase } from './dsl.js';
+import type { CollectionSchemaBase, SchemaBase } from './dsl.js';
 import type { FrontAppSchema, ProjectApiSchema } from './project.js';
 import type { DtoMessage } from './dto.js';
 import type { ExceptionSchema } from './exception.js';
 import type { FlowSchema } from './flow.js';
-/** A backend service serving exactly one frontend app (1:1 module). */
-export interface ServiceSchema extends SchemaBase {
+/** A backend service serving one frontend app (1:1 module), or a
+ *  platform-shared domain service (app unset — shared across modules). */
+export interface ServiceSchema extends CollectionSchemaBase {
     type: 'service';
     /** The backend api module this service belongs to (shared instance from
      *  project.config.ts apis). Services are always backend-side, so storage is
-     *  service_schema/{api.name}/{app.name}/service/. */
+     *  service_schema/{api.name}/{app.name}/service/ — app unset = the api-level
+     *  common domain layer, stored at service_schema/{api.name}/common/service/. */
     api: ProjectApiSchema;
-    /** The frontend app this service serves (shared instance from project.config). */
-    app: FrontAppSchema;
+    /** The frontend app this service serves (shared instance from project.config).
+     *  Unset = api-level common domain service shared by all modules of the api. */
+    app?: FrontAppSchema;
     /** Methods keyed by name — the map key is written back as the method name. */
     methods: Record<string, ServiceMethodSchema>;
 }
@@ -20,11 +23,13 @@ export type ServiceMethodDef = Omit<ServiceMethodSchema, 'type' | 'schema' | 'na
 export declare function defineService(options: {
     name: string;
     api: ProjectApiSchema;
-    app: FrontAppSchema;
+    app?: FrontAppSchema;
     methods: Record<string, ServiceMethodDef>;
     description?: string;
 }): ServiceSchema;
-/** A method exposed by a service. */
+/** A method exposed by a business service — the contract with the calling
+ *  frontend. Third-party integration methods are a separate contract
+ *  (ThirdServiceMethodSchema): they can never bind a flow. */
 export interface ServiceMethodSchema extends SchemaBase {
     type: 'method';
     schema: ServiceSchema;

package/dist/service.js

@@ -1,6 +1,6 @@
 import { exceptionEndNames } from './flow.js';
 export function defineService(options) {
-    if (!options.api.apps.includes(options.app)) {
+    if (options.app && !options.api.apps.includes(options.app)) {
         throw new Error(`service ${options.name}: api '${options.api.name}' does not serve app '${options.app.name}'`);
     }
     const schema = {

package/dist/third-service.d.ts

@@ -1,6 +1,6 @@
-import { CollectionSchemaBase, Field, SchemaBase } from './dsl.js';
+import type { SchemaBase } from './dsl.js';
+import type { DtoMessage } from './dto.js';
 import type { ExceptionSchema } from './exception.js';
-import type { FieldRuleEnd, FieldRuleSchema } from './field-rule.js';
 import type { ThirdApiSchema } from './project.js';
 /** A third-party integration service (e.g. tenpay wechat pay).
  *  Distinct from ServiceSchema (backend service bound to an app) and
@@ -13,65 +13,22 @@ export interface ThirdServiceSchema extends SchemaBase {
     /** Methods keyed by name — the map key is written back as the method name. */
     methods: Record<string, ThirdServiceMethodSchema>;
 }
-/** A method exposed by a third-party service. */
+/** A method of a third-party integration service. Same contract shape as
+ *  ServiceMethodSchema minus flow — the implementation lives in the external
+ *  system, there is nothing to model. Kept separate so a third method can
+ *  never bind a flow. */
 export interface ThirdServiceMethodSchema extends SchemaBase {
     type: 'method';
     schema: ThirdServiceSchema;
-    /** Input message — the Field-collection counterpart of a DtoMessage. */
-    args: ThirdMethodSchema;
-    /** Output message. */
-    results: ThirdMethodSchema;
-    /** Exceptions this method may throw (e.g. IOException, CodeException). */
-    throws?: ExceptionSchema[];
-}
-/** Field binding to a rule: which end the local wire field stands on.
- *  The ref always stands on the other end — from/to carry no extra information. */
-export interface ConvertFieldSchema {
-    /** The rule binding field and ref (rule = name + two ends). */
-    rule: FieldRuleSchema;
-    /** The end instance the local wire field stands on. */
-    end: FieldRuleEnd;
-}
-/** Same-fact variant link: a wire field carrying the same fact as a local
- *  entity column under a different type/format (e.g. total_fee in fen vs amount in yuan). */
-export interface ThirdFieldRef {
-    /** Wire field defined in this message (local definition). */
-    field: Field;
-    /** Field in another schema (table column or another message). */
-    ref: Field;
-    /** Optional rule binding — omitted when the fact is merely linked, not converted. */
-    convert?: ConvertFieldSchema;
-}
-/** A directional message of a third-party method: a Field collection mirroring
- *  TableSchema.columns, but fields hold wire-format names/types. A field may be
- *  a shared instance of a local entity column (same fact, same type) — its
- *  name/schema keep pointing at the table and the DTO projection inherits
- *  type/semantics from the entity, exactly like from(table). */
-export interface ThirdMethodSchema extends CollectionSchemaBase {
-    type: 'thirdMethod';
-    /** The method this message belongs to (direction implied by args/results slot). */
-    schema: ThirdServiceMethodSchema;
-    /** Wire-format fields. */
-    fields: Record<string, Field>;
-    /** Same-fact variant links: wire field -> local entity column. */
-    refs?: ThirdFieldRef[];
-}
-/** Message input for defineThirdMethod: type/schema are set by the builder. */
-export type ThirdMethodDef = Omit<ThirdMethodSchema, 'type' | 'schema'>;
-/** Build a third-party method message. Writes back name/schema on own fields
- *  (top-level and nested); shared entity columns keep their table identity and
- *  must be keyed by their column name. */
-export declare function defineThirdMethod(def: ThirdMethodDef): ThirdMethodSchema;
-/** Method input for defineThirdService: name is written back from the methods map key. */
-export interface ThirdServiceMethodDef {
     /** Input message. */
-    args: ThirdMethodDef;
+    args: DtoMessage;
     /** Output message. */
-    results: ThirdMethodDef;
+    results: DtoMessage;
     /** Exceptions this method may throw (e.g. IOException, CodeException). */
     throws?: ExceptionSchema[];
-    description?: string;
 }
+/** Method input for defineThirdService: name/schema are set by the builder. */
+export type ThirdServiceMethodDef = Omit<ThirdServiceMethodSchema, 'type' | 'schema' | 'name'>;
 export declare function defineThirdService(options: {
     schema: ThirdApiSchema;
     name: string;

package/dist/third-service.js

@@ -1,73 +1,3 @@
-/** Build a third-party method message. Writes back name/schema on own fields
- *  (top-level and nested); shared entity columns keep their table identity and
- *  must be keyed by their column name. */
-export function defineThirdMethod(def) {
-    const message = {
-        type: 'thirdMethod',
-        name: def.name,
-        description: def.description,
-        // Filled by defineThirdService.
-        schema: undefined,
-        fields: def.fields,
-        refs: def.refs,
-    };
-    for (const key of Object.keys(message.fields)) {
-        const field = message.fields[key];
-        if (field.schema === undefined) {
-            field.name = key;
-            field.schema = message;
-        }
-        else if (field.schema.type === 'table') {
-            // Shared entity column: from() names the projection after field.name, so
-            // a mismatched key would silently rename the wire field. Same-fact fields
-            // with different names go through refs instead.
-            if (field.name !== key) {
-                throw new Error(`thirdMethod '${message.name}': shared column key '${key}' must match the column name '${field.name}' — ` +
-                    `same-fact fields with different names go through refs instead`);
-            }
-        }
-        else if (field.schema !== message) {
-            throw new Error(`thirdMethod '${message.name}': field '${key}' already belongs to ${field.schema.type} '${field.schema.name}', cannot reuse`);
-        }
-        writeBackNested(message, field);
-    }
-    if (message.refs !== undefined) {
-        const ownFields = Object.values(message.fields);
-        for (const link of message.refs) {
-            if (!ownFields.includes(link.field)) {
-                throw new Error(`thirdMethod '${message.name}': ref field must be one of its fields`);
-            }
-            if (link.ref.schema === undefined || link.ref.schema === message) {
-                throw new Error(`thirdMethod '${message.name}': ref target '${link.ref.name}' must be defined in another schema`);
-            }
-            if (link.convert !== undefined) {
-                const ends = Object.values(link.convert.rule.ends);
-                if (!ends.includes(link.convert.end)) {
-                    throw new Error(`thirdMethod '${message.name}': convert end '${link.convert.end.name}' must be one of rule '${link.convert.rule.name}' ends`);
-                }
-            }
-        }
-    }
-    return message;
-}
-/** Write back name/schema on nested wire fields (array items, object properties);
- *  shared entity columns keep their table identity. */
-function writeBackNested(message, field) {
-    if (field.type === 'array') {
-        writeBackNested(message, field.items);
-        return;
-    }
-    if (field.type !== 'object')
-        return;
-    for (const key of Object.keys(field.properties)) {
-        const child = field.properties[key];
-        if (child.schema === undefined) {
-            child.name = key;
-            child.schema = message;
-        }
-        writeBackNested(message, child);
-    }
-}
 export function defineThirdService(options) {
     const schema = {
         type: 'thirdService',
@@ -78,20 +8,15 @@ export function defineThirdService(options) {
     };
     for (const key of Object.keys(options.methods)) {
         const method = options.methods[key];
-        const methodSchema = {
+        schema.methods[key] = {
             type: 'method',
             name: key,
             description: method.description,
             schema,
-            args: undefined,
-            results: undefined,
+            args: method.args,
+            results: method.results,
             throws: method.throws,
         };
-        methodSchema.args = defineThirdMethod(method.args);
-        methodSchema.results = defineThirdMethod(method.results);
-        methodSchema.args.schema = methodSchema;
-        methodSchema.results.schema = methodSchema;
-        schema.methods[key] = methodSchema;
     }
     return schema;
 }

package/dist/typebox-driver.d.ts

@@ -1,5 +1,4 @@
 import { DtoMessage, ImportBase } from './dto.js';
-import type { ThirdMethodSchema } from './third-service.js';
 export type EnumResolver = (enumName: string) => ImportBase | undefined;
 /** Collect all imports needed to render a DTO: include() bases + enum references. */
 export declare function collectDtoImports(schema: DtoMessage, resolver: EnumResolver | undefined, out: Map<string, ImportBase>): void;
@@ -11,8 +10,3 @@ export declare function renderDtoMessage(schema: DtoMessage, options?: {
     resolver?: EnumResolver;
     source?: string;
 }): string;
-/** Render one third-party method message export (const only — pair with
- *  renderDtoTypeExport for the Static type). */
-export declare function renderThirdMethodExport(schema: ThirdMethodSchema, resolver: EnumResolver | undefined): string;
-/** Collect all imports needed to render a third-party method message: enum references. */
-export declare function collectThirdMethodImports(schema: ThirdMethodSchema, resolver: EnumResolver | undefined, out: Map<string, ImportBase>): void;

package/dist/typebox-driver.js

@@ -1,3 +1,5 @@
+import { isDtoField, isDtoMessage } from './dto.js';
+import { collectEnumRefs } from './dsl.js';
 function renderString(s) {
     return `'${s.replace(/\\/g, '\\\\').replace(/'/g, "\\'")}'`;
 }
@@ -116,18 +118,6 @@ function renderValue(f, indent, resolver) {
     // annotations; DB field defaults are not carried into the API contract.
     return renderBasic(f.field, f.pattern, f.default, resolver, indent);
 }
-/** Structural check — DtoMessage instances may come from a different module copy, so instanceof is unreliable. */
-function isDtoMessage(v) {
-    if (typeof v !== 'object' || v === null)
-        return false;
-    return v.type === 'dto';
-}
-/** Structural check — a DtoField wraps a Field in a .field property and has no .type of its own. */
-function isDtoField(v) {
-    if (typeof v !== 'object' || v === null)
-        return false;
-    return 'field' in v && !('type' in v);
-}
 function collectEnumImports(f, resolver, out) {
     if (f.field.type === 'array') {
         const items = f.field.items;
@@ -154,23 +144,15 @@ function collectEnumImports(f, resolver, out) {
 }
 /** Enum import collection over a plain Field (wire-format nested fields). */
 function collectFieldEnumImports(field, resolver, out) {
-    if (field.type === 'array') {
-        collectFieldEnumImports(field.items, resolver, out);
-        return;
-    }
-    if (field.type === 'object') {
-        for (const child of Object.values(field.properties))
-            collectFieldEnumImports(child, resolver, out);
-        return;
+    for (const jsName of collectEnumRefs(field)) {
+        const ref = resolver?.(jsName);
+        if (!ref)
+            throw new Error(`enum ${jsName}: no import ref — pass an EnumResolver`);
+        out.set(`${ref.from}#${ref.name}`, ref);
     }
-    if (field.type === 'enum')
-        collectEnumRef(field, resolver, out);
 }
 function collectEnumRef(field, resolver, out) {
-    const ref = resolver?.(field.enum.jsName);
-    if (!ref)
-        throw new Error(`enum field ${field.name}: no import ref for ${field.enum.jsName} — pass an EnumResolver`);
-    out.set(`${ref.from}#${ref.name}`, ref);
+    collectFieldEnumImports(field, resolver, out);
 }
 /** Collect all imports needed to render a DTO: include() bases + enum references. */
 export function collectDtoImports(schema, resolver, out) {
@@ -216,13 +198,3 @@ function renderBase(base) {
     const args = base.args.map((a) => (typeof a === 'string' ? a : a.name));
     return `${base.name}(${args.join(', ')})`;
 }
-/** Render one third-party method message export (const only — pair with
- *  renderDtoTypeExport for the Static type). */
-export function renderThirdMethodExport(schema, resolver) {
-    return `export const ${schema.name} = ${renderFieldObject(schema.fields, 1, resolver)};`;
-}
-/** Collect all imports needed to render a third-party method message: enum references. */
-export function collectThirdMethodImports(schema, resolver, out) {
-    for (const f of Object.values(schema.fields))
-        collectFieldEnumImports(f, resolver, out);
-}

package/dist/utils.d.ts

@@ -1,4 +1,4 @@
-import type { Field, SchemaBase } from './dsl.js';
+import type { CollectionSchemaBase, Field, SchemaBase } from './dsl.js';
 import type { FrontAppSchema, ProjectApiSchema } from './project.js';
 /** A utility method with a full signature. */
 export interface UtilsMethodSchema extends SchemaBase {
@@ -13,7 +13,7 @@ export interface UtilsMethodSchema extends SchemaBase {
 /** Method input for defineUtils: type/schema/name are set by the builder. */
 export type UtilsMethodDef = Omit<UtilsMethodSchema, 'type' | 'schema' | 'name'>;
 /** A base utility module (e.g. DateTimeUtils). */
-export interface UtilsSchema extends SchemaBase {
+export interface UtilsSchema extends CollectionSchemaBase {
     type: 'utils';
     /** Backend binding — the api module this utils belongs to (shared instance
      *  from project.config.ts apis). With `app` it serves that frontend