npm - @pjts/schema - Versions diffs - 0.0.125 → 0.0.127 - Mend

@pjts/schema 0.0.125 → 0.0.127

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/dist/__test__/decorator.d.ts +1 -0
package/dist/__test__/decorator.js +3 -1
package/dist/__test__/decorator.js.map +1 -1
package/dist/__test__/domain.d.ts +5 -0
package/dist/__test__/domain.js +17 -1
package/dist/__test__/domain.js.map +1 -1
package/dist/__test__/service.d.ts +4 -1
package/dist/__test__/service.js +15 -0
package/dist/__test__/service.js.map +1 -1
package/dist/generate-client-types.js +38 -2
package/dist/generate-client-types.js.map +1 -1
package/package.json +2 -2

package/dist/__test__/decorator.d.ts CHANGED Viewed

@@ -3,3 +3,4 @@ export declare function AppService(_target: any): void;
 export declare function Param(_target: any, _key: any, _descriptor: any): void;
 export declare function File(_target: any, _key: any, _descriptor: any): void;
 export declare function Ip(_target: any, _key: any, _descriptor: any): void;
+export declare function StringDomainPrimitive(_target: any): void;

package/dist/__test__/decorator.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Ip = exports.File = exports.Param = exports.AppService = exports.HttpModule = void 0;
+exports.StringDomainPrimitive = exports.Ip = exports.File = exports.Param = exports.AppService = exports.HttpModule = void 0;
 const HttpModule = () => (_target) => { };
 exports.HttpModule = HttpModule;
 function AppService(_target) { }
@@ -11,4 +11,6 @@ function File(_target, _key, _descriptor) { }
 exports.File = File;
 function Ip(_target, _key, _descriptor) { }
 exports.Ip = Ip;
+function StringDomainPrimitive(_target) { }
+exports.StringDomainPrimitive = StringDomainPrimitive;
 //# sourceMappingURL=decorator.js.map

package/dist/__test__/decorator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"decorator.js","sourceRoot":"","sources":["../../src/__test__/decorator.ts"],"names":[],"mappings":";;;AAAO,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,CAAC,OAAY,EAAE,EAAE,GAAE,CAAC,CAAA;AAAvC,QAAA,UAAU,cAA6B;AAEpD,SAAgB,UAAU,CAAC,OAAY,IAAG,CAAC;AAA3C,gCAA2C;AAE3C,SAAgB,KAAK,CAAC,OAAY,EAAE,IAAS,EAAE,WAAgB,IAAG,CAAC;AAAnE,sBAAmE;AAEnE,SAAgB,IAAI,CAAC,OAAY,EAAE,IAAS,EAAE,WAAgB,IAAG,CAAC;AAAlE,oBAAkE;AAElE,SAAgB,EAAE,CAAC,OAAY,EAAE,IAAS,EAAE,WAAgB,IAAG,CAAC;AAAhE,gBAAgE"}
1	+ {"version":3,"file":"decorator.js","sourceRoot":"","sources":["../../src/__test__/decorator.ts"],"names":[],"mappings":";;;AAAO,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,CAAC,OAAY,EAAE,EAAE,GAAE,CAAC,CAAA;AAAvC,QAAA,UAAU,cAA6B;AAEpD,SAAgB,UAAU,CAAC,OAAY,IAAG,CAAC;AAA3C,gCAA2C;AAE3C,SAAgB,KAAK,CAAC,OAAY,EAAE,IAAS,EAAE,WAAgB,IAAG,CAAC;AAAnE,sBAAmE;AAEnE,SAAgB,IAAI,CAAC,OAAY,EAAE,IAAS,EAAE,WAAgB,IAAG,CAAC;AAAlE,oBAAkE;AAElE,SAAgB,EAAE,CAAC,OAAY,EAAE,IAAS,EAAE,WAAgB,IAAG,CAAC;AAAhE,gBAAgE;AAEhE,SAAgB,qBAAqB,CAAC,OAAY,IAAG,CAAC;AAAtD,sDAAsD"}

package/dist/__test__/domain.d.ts CHANGED Viewed

@@ -1,4 +1,9 @@
 import { NullStr } from '@pjts/core';
+export declare class WarehouseId {
+    private readonly value;
+    constructor(value: string);
+    toJSON(): string;
+}
 export interface IndexedType {
     [key: string]: number;
 }

package/dist/__test__/domain.js CHANGED Viewed

@@ -1,8 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntityWithConditions = exports.Token = exports.OptionalValueObject = exports.ValueObject = exports.ComplexEntity = exports.ComposedDomainPrimitive = exports.DomainPrimitive = exports.MyClass2 = exports.MyClass = exports.OtherVO = exports.NestedDto = exports.NestedItem = exports.MyDto = exports.FileDto = void 0;
+exports.EntityWithConditions = exports.Token = exports.OptionalValueObject = exports.ValueObject = exports.ComplexEntity = exports.ComposedDomainPrimitive = exports.DomainPrimitive = exports.MyClass2 = exports.MyClass = exports.OtherVO = exports.NestedDto = exports.NestedItem = exports.MyDto = exports.FileDto = exports.WarehouseId = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@pjts/core");
+const decorator_1 = require("./decorator");
+// Test case for StringDomainPrimitive - should output as 'WarehouseId = string', not 'WarehouseIdJSON'
+let WarehouseId = class WarehouseId {
+    value;
+    constructor(value) {
+        this.value = value;
+    }
+    toJSON() {
+        return this.value;
+    }
+};
+WarehouseId = tslib_1.__decorate([
+    decorator_1.StringDomainPrimitive,
+    tslib_1.__metadata("design:paramtypes", [String])
+], WarehouseId);
+exports.WarehouseId = WarehouseId;
 class FileDto {
     data;
     constructor(data) {

package/dist/__test__/domain.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"domain.js","sourceRoot":"","sources":["../../src/__test__/domain.ts"],"names":[],"mappings":";;;;AAAA,qCAA4C;~~AAM5C~~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"}
1	+ {"version":3,"file":"domain.js","sourceRoot":"","sources":["../../src/__test__/domain.ts"],"names":[],"mappings":"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"}

package/dist/__test__/service.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { ComplexEntity, ComplexInterface, ComplexType, ComposedDomainPrimitive, DomainPrimitive, IndexedType, ListResult, MyClass, MyDto, NestedDto, Token, ValueObject, FileDto, OtherVO, ExtendedComplexInterface, OptionalValueObject, EntityWithConditions } from "./domain";
+import { ComplexEntity, ComplexInterface, ComplexType, ComposedDomainPrimitive, DomainPrimitive, IndexedType, ListResult, MyClass, MyDto, NestedDto, Token, ValueObject, FileDto, OtherVO, ExtendedComplexInterface, OptionalValueObject, EntityWithConditions, WarehouseId } from "./domain";
 interface CustomType {
     name: string;
 }
@@ -35,6 +35,9 @@ export declare class MyService {
     middleware(_ipAddress: OtherVO): Promise<void>;
     extended(_ipAddress: OtherVO): Promise<ExtendedComplexInterface[]>;
     getEntityWithConditions(): Promise<EntityWithConditions>;
+    getNestedDto(): Promise<NestedDto>;
+    getWarehouseId(): Promise<WarehouseId>;
+    getWarehouseById(_id: WarehouseId): Promise<string>;
     private secretMethod;
 }
 export declare class MyService2 {

package/dist/__test__/service.js CHANGED Viewed

@@ -86,6 +86,15 @@ let MyService = class MyService {
     async getEntityWithConditions() {
         return new domain_1.EntityWithConditions({ name: 'test', conditions: [] });
     }
+    async getNestedDto() {
+        return new domain_1.NestedDto();
+    }
+    async getWarehouseId() {
+        return new domain_1.WarehouseId('test-warehouse-id');
+    }
+    async getWarehouseById(_id) {
+        return 'warehouse-name';
+    }
     secretMethod() {
         //
     }
@@ -126,6 +135,12 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [domain_1.OtherVO]),
     tslib_1.__metadata("design:returntype", Promise)
 ], MyService.prototype, "extended", null);
+tslib_1.__decorate([
+    tslib_1.__param(0, decorator_1.Param),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [domain_1.WarehouseId]),
+    tslib_1.__metadata("design:returntype", Promise)
+], MyService.prototype, "getWarehouseById", null);
 MyService = tslib_1.__decorate([
     decorator_1.AppService
 ], MyService);

package/dist/__test__/service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/__test__/service.ts"],"names":[],"mappings":";;;;AAAA,~~qCAYkB~~;AAClB,2CAA0D;AAenD,IAAM,SAAS,GAAf,MAAM,SAAS;IACP,AAAN,KAAK,CAAC,KAAK,CAAQ,IAAiB;QACzC,MAAM,QAAQ,GAAG,IAAI,gBAAO,EAAE,CAAA;QAC9B,OAAO,QAAQ,CAAC,MAAM,EAAE,CAAA;IAC1B,CAAC;IAEY,AAAN,KAAK,CAAC,KAAK,CAAQ,IAAqB;QAC7C,OAAO;YACL,QAAQ,EAAE,CAAC;SACZ,CAAA;IACH,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,MAAM,QAAQ,GAAG,IAAI,gBAAO,EAAE,CAAA;QAC9B,OAAO;YACL,QAAQ,CAAC,MAAM,EAAE;YACjB,QAAQ,CAAC,MAAM,EAAE;SAClB,CAAA;IACH,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,OAAO;YACL,QAAQ,EAAE,KAAK;SAChB,CAAA;IACH,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,EAA2B;QAC5C,OAAO;YACL,QAAQ,EAAE,IAAI,gBAAO,EAAE;SACxB,CAAA;IACH,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,IAAI,CAAC,YAAY,EAAE,CAAA;QACnB,OAAO,IAAI,gBAAO,EAAE,CAAA;IACtB,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,OAAO,CAAC;gBACN,IAAI,EAAE,MAAM;aACb,CAAC,CAAA;IACJ,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,OAAO,EAAE,CAAA;IACX,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,IAAW;QAC5B,OAAO,EAAE,CAAA;IACX,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,MAAa;QAC/B,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,MAAM;QACjB,OAAO,EAAE,CAAA;IACX,CAAC;IAEM,KAAK,CAAC,MAAM;QACjB,OAAO,EAAE,CAAA;IACX,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,IAAe;QACjC,EAAE;IACJ,CAAC;IAEM,KAAK,CAAC,MAAM;QACjB,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;YAClB,OAAO,IAAI,CAAA;SACZ;QACD,OAAO,IAAI,gBAAO,EAAE,CAAA;IACtB,CAAC;IAEM,KAAK,CAAC,MAAM;QACjB,OAAO;YACL,WAAW,EAAE,MAAM;YACnB,QAAQ,EAAE;gBACR,EAAE,EAAE,GAAG;aACR;SACF,CAAA;IACH,CAAC;IAEY,AAAN,KAAK,CAAC,MAAM,CAAQ,IAAyB;QAClD,OAAM;IACR,CAAC;IAEY,AAAN,KAAK,CAAC,MAAM,CAAO,KAAc;QACtC,EAAE;IACJ,CAAC;IAEY,AAAN,KAAK,CAAC,UAAU,CAAK,UAAmB;IAE/C,CAAC;IAEY,AAAN,KAAK,CAAC,QAAQ,CAAK,UAAmB;QAC3C,OAAO,EAAE,CAAA;IACX,CAAC;IAEM,KAAK,CAAC,uBAAuB;QAClC,OAAO,IAAI,6BAAoB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAA;IACnE,CAAC;IAEO,YAAY;QAClB,EAAE;IACJ,CAAC;CACF,CAAA;~~AAzGc~~;IAAO,mBAAA,iBAAK,CAAA;;6CAAO,oBAAW;;sCAG1C;AAEY;IAAO,mBAAA,iBAAK,CAAA;;6CAAO,wBAAe;;sCAI9C;AAyEY;IAAQ,mBAAA,iBAAK,CAAA;;6CAAO,4BAAmB;;uCAEnD;AAEY;IAAQ,mBAAA,gBAAI,CAAA;;6CAAQ,gBAAO;;uCAEvC;AAEY;IAAY,mBAAA,cAAE,CAAA;;6CAAa,gBAAO;;2CAE9C;AAEY;IAAU,mBAAA,cAAE,CAAA;;6CAAa,gBAAO;;yCAE5C;~~AAjGU~~,SAAS;IADrB,sBAAU;GACE,SAAS,~~CA0GrB~~;~~AA1GY~~,8BAAS;~~AA4GtB~~,MAAa,UAAU;IACd,KAAK,CAAC,UAAU;QACrB,OAAO,EAAE,CAAA;IACX,CAAC;CACF;AAJD,gCAIC;AAGM,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,UAAU;IACrC,KAAK,CAAC,eAAe;QAC1B,OAAO,EAAE,CAAA;IACX,CAAC;CACF,CAAA;AAJY,cAAc;IAD1B,sBAAU;GACE,cAAc,CAI1B;AAJY,wCAAc"}
1	+ {"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/__test__/service.ts"],"names":[],"mappings":"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"}

package/dist/generate-client-types.js CHANGED Viewed

@@ -252,8 +252,27 @@ const getMethodParamsType = (checker, method) => {
 };
 // Output
 const appendToJSONSuffix = (typeDeclaration, typeName) => typeDeclaration.replace(typeName, typeName + 'JSON');
+const PRIMITIVE_TYPES = ['string', 'number', 'boolean', 'Date'];
+// Check if a class is a domain primitive (toJSON returns a primitive type)
+const isDomainPrimitive = (checker, declaration) => {
+    const serializableDeclaration = declaration.members.find(member => member.name?.getText() === ENTITY_SERIALIZE_METHOD);
+    if (!serializableDeclaration)
+        return false;
+    const _type = checker.getTypeAtLocation(serializableDeclaration.name);
+    const toJSONSignatures = checker.getSignaturesOfType(_type, ts.SignatureKind.Call);
+    if (!toJSONSignatures[0])
+        return false;
+    const toJSONReturnType = toJSONSignatures[0].getReturnType();
+    const returnType = sanitizeTypeName(checker.typeToString(toJSONReturnType, serializableDeclaration, ts.TypeFormatFlags.UseFullyQualifiedType));
+    return PRIMITIVE_TYPES.includes(returnType) || returnType.includes('|');
+};
 const getClassOutputType = (checker, declaration) => {
     const typeName = declaration.name?.getText();
+    // For @Dto decorated classes, use the DTO type resolution (properties as optional)
+    if (isDecoratedWith(declaration, 'Dto')) {
+        const dtoType = resolveDtoDeclarationType(checker, declaration);
+        return `export type ${typeName} = ${dtoType};`;
+    }
     const serializableDeclaration = declaration.members.find(member => member.name?.getText() === ENTITY_SERIALIZE_METHOD);
     if (!serializableDeclaration) {
         throw new Error(`${typeName} is used in return statement but doesn't implement ${ENTITY_SERIALIZE_METHOD} method`);
@@ -289,6 +308,12 @@ const getClassOutputType = (checker, declaration) => {
     if (!isDeclared(returnType) && declarations[returnType]) {
         return `export type ${typeName} = ${resolveDeclarationType(checker, declarations[returnType])}`;
     }
+    // For domain primitives (toJSON returns a primitive type like string, number, etc.),
+    // don't append JSON suffix - use the class name directly
+    const isPrimitiveReturn = PRIMITIVE_TYPES.includes(returnType) || returnType.includes('|');
+    if (isPrimitiveReturn) {
+        return `export type ${typeName} = ${returnType};`;
+    }
     return appendToJSONSuffix(`export type ${typeName} = ${returnType}`, typeName);
 };
 const getInterfaceOutputType = (checker, declaration) => {
@@ -323,7 +348,13 @@ const registerOutputType = (checker, typeName) => {
         return;
     }
     if (ts.isClassDeclaration(node)) {
-        addTopLevelDeclaration(node.name.getText() + 'JSON', getClassOutputType(checker, node));
+        // Get the output type first to determine if it's a domain primitive (returns primitive type)
+        const outputType = getClassOutputType(checker, node);
+        // Check if the output type contains "JSON" suffix - if not, it's a Dto or domain primitive
+        const typeName = node.name.getText();
+        const hasJsonSuffix = outputType.includes(`${typeName}JSON`);
+        const declarationName = hasJsonSuffix ? typeName + 'JSON' : typeName;
+        addTopLevelDeclaration(declarationName, outputType);
     }
     else if (ts.isInterfaceDeclaration(node)) {
         handleReferenceType(checker, node);
@@ -343,7 +374,12 @@ const getMethodReturnType = (checker, method) => {
         registerOutputType(checker, chunk);
     });
     for (const chunk of chunks) {
-        if (declarations[chunk] && ts.isClassDeclaration(declarations[chunk])) {
+        const decl = declarations[chunk];
+        if (decl && ts.isClassDeclaration(decl)) {
+            // Don't append JSON suffix for @Dto decorated classes or domain primitives
+            if (isDecoratedWith(decl, 'Dto') || isDomainPrimitive(checker, decl)) {
+                return returnType;
+            }
             return appendToJSONSuffix(returnType, chunk);
         }
     }

package/dist/generate-client-types.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generate-client-types.js","sourceRoot":"","sources":["../src/generate-client-types.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"generate-client-types.js","sourceRoot":"","sources":["../src/generate-client-types.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@pjts/schema",
-  "version": "0.0.125",
+  "version": "0.0.127",
   "description": "Piotr Józefów DDD utility package",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -24,7 +24,7 @@
     "pjts-types": "./scripts/run-build-types.js"
   },
   "devDependencies": {
-    "@pjts/fastify": "^0.0.97",
+    "@pjts/fastify": "^0.0.99",
     "@types/jest": "29.4.0",
     "@types/node": "18.13.0",
     "jest": "29.4.2",