@nx-ddd/any-func 18.2.0 → 18.4.0
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.
- package/lib/any-func/any-func.service.impl.d.ts +14 -7
- package/lib/any-func/any-func.service.impl.js +22 -17
- package/lib/any-func/any-func.service.impl.js.map +1 -1
- package/lib/impl/adapters/cache/cache.adapter.js +2 -2
- package/lib/impl/adapters/cache/cache.adapter.js.map +1 -1
- package/lib/impl/json-schema/json-schema.js +17 -1
- package/lib/impl/json-schema/json-schema.js.map +1 -1
- package/lib/index.d.ts +1 -0
- package/lib/index.js +1 -0
- package/lib/index.js.map +1 -1
- package/package.json +2 -2
|
@@ -15,25 +15,32 @@ export interface CallOptions<I, O, S extends {
|
|
|
15
15
|
sample?: number;
|
|
16
16
|
temperature?: number;
|
|
17
17
|
maxRetry?: number;
|
|
18
|
+
validator?: (output: O) => Promise<any>;
|
|
18
19
|
}
|
|
19
20
|
interface AnyFuncConfig {
|
|
20
21
|
debug: boolean;
|
|
22
|
+
openaiApiKey: string;
|
|
21
23
|
}
|
|
22
|
-
export declare function provideAnyFunc(
|
|
23
|
-
provide: InjectionToken<AnyFuncConfig>;
|
|
24
|
-
useValue: AnyFuncConfig;
|
|
25
|
-
}[] | {
|
|
24
|
+
export declare function provideAnyFunc(useFactory?: () => AnyFuncConfig): (import("@angular/core").Provider[] | {
|
|
26
25
|
provide: InjectionToken<AnyFuncService>;
|
|
27
26
|
useClass: typeof AnyFuncService;
|
|
27
|
+
useFactory?: undefined;
|
|
28
|
+
} | {
|
|
29
|
+
provide: InjectionToken<AnyFuncConfig>;
|
|
30
|
+
useFactory: () => AnyFuncConfig;
|
|
31
|
+
useClass?: undefined;
|
|
28
32
|
})[];
|
|
33
|
+
export declare function defaultValidatorFactory<O>(jsonSchema: FunctionParameters | any): (output: O) => Promise<any>;
|
|
29
34
|
export declare class AnyFuncService {
|
|
30
35
|
protected readonly openai: import("@nx-ddd/common/infrastructure/externals/openai/open-ai.service.impl").OpenAiServiceImpl;
|
|
31
|
-
protected readonly config: AnyFuncConfig
|
|
36
|
+
protected readonly config: AnyFuncConfig | {
|
|
37
|
+
debug: false;
|
|
38
|
+
};
|
|
32
39
|
protected cache: CacheAdapter;
|
|
33
|
-
jsonSchema(_input: any, jsonSchema: FunctionParameters, { instructions, model, specs, embeddings, sample, temperature, maxRetry, }?: CallOptions<any, any>): Promise<any>;
|
|
40
|
+
jsonSchema(_input: any, jsonSchema: FunctionParameters, { instructions, model, specs, embeddings, sample, temperature, maxRetry, validator, }?: CallOptions<any, any>): Promise<any>;
|
|
34
41
|
call<I, O>(_input: I, args: {
|
|
35
42
|
new (): O;
|
|
36
|
-
}, { instructions, model, specs, embeddings, sample, temperature, maxRetry, }?: CallOptions<I, O>): Promise<O>;
|
|
43
|
+
}, { instructions, model, specs, embeddings, sample, temperature, maxRetry, validator, }?: CallOptions<I, O>): Promise<O>;
|
|
37
44
|
protected complete<I, O>(_input: any, jsonSchema: FunctionParameters, messages: ChatCompletionMessageParam[], { model, temperature, }?: CallOptions<I, O> & {
|
|
38
45
|
functionOutput?: object;
|
|
39
46
|
}): Promise<import("openai/resources").ChatCompletionMessage>;
|
|
@@ -1,31 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var _a;
|
|
2
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
4
|
exports.AnyFuncService = void 0;
|
|
4
5
|
exports.provideAnyFunc = provideAnyFunc;
|
|
6
|
+
exports.defaultValidatorFactory = defaultValidatorFactory;
|
|
5
7
|
const tslib_1 = require("tslib");
|
|
6
8
|
const core_1 = require("@angular/core");
|
|
7
9
|
const openai_1 = require("@nx-ddd/common/infrastructure/externals/openai");
|
|
8
10
|
const rxjs_1 = require("rxjs");
|
|
11
|
+
const json_schema_library_1 = tslib_1.__importDefault(require("json-schema-library"));
|
|
9
12
|
// MEMO(@nontangent): SchematicsXのビルド時はimportじゃないとランタイムエラーになるが、CLI之ビルド時はconstじゃないとビルドできない。
|
|
10
|
-
|
|
11
|
-
|
|
13
|
+
// import { Draft07 } from 'json-schema-library';
|
|
14
|
+
const Draft07 = (_a = json_schema_library_1.default === null || json_schema_library_1.default === void 0 ? void 0 : json_schema_library_1.default.Draft07) !== null && _a !== void 0 ? _a : require('json-schema-library').Draft07;
|
|
12
15
|
const agent_1 = require("../agent");
|
|
13
16
|
const json_schema_1 = require("../impl/json-schema");
|
|
14
17
|
const any_func_service_1 = require("./any-func.service");
|
|
15
18
|
const cache_1 = require("../impl/adapters/cache");
|
|
16
19
|
const p_limit_1 = tslib_1.__importDefault(require("p-limit"));
|
|
17
20
|
const ANY_FUNC_CONFIG = new core_1.InjectionToken('[@nx-ddd/any-func] AnyFuncConfig');
|
|
18
|
-
function
|
|
21
|
+
function provideAnyFunc(useFactory) {
|
|
19
22
|
return [
|
|
20
|
-
{ provide: ANY_FUNC_CONFIG, useValue: config },
|
|
21
|
-
];
|
|
22
|
-
}
|
|
23
|
-
function provideAnyFunc(config) {
|
|
24
|
-
return [
|
|
25
|
-
config ? provideAnyFuncConfig(config) : [],
|
|
26
23
|
{ provide: any_func_service_1.ANY_FUNC_SERVICE, useClass: AnyFuncService },
|
|
24
|
+
{ provide: ANY_FUNC_CONFIG, useFactory },
|
|
25
|
+
(0, openai_1.provideOpenaiService)(() => ({
|
|
26
|
+
apiKey: useFactory().openaiApiKey,
|
|
27
|
+
})),
|
|
27
28
|
];
|
|
28
29
|
}
|
|
30
|
+
function defaultValidatorFactory(jsonSchema) {
|
|
31
|
+
return (output) => tslib_1.__awaiter(this, void 0, void 0, function* () { return new Draft07(jsonSchema).validate(output); });
|
|
32
|
+
}
|
|
29
33
|
let AnyFuncService = class AnyFuncService {
|
|
30
34
|
constructor() {
|
|
31
35
|
var _a;
|
|
@@ -34,10 +38,9 @@ let AnyFuncService = class AnyFuncService {
|
|
|
34
38
|
this.cache = (0, core_1.inject)(cache_1.CacheAdapter);
|
|
35
39
|
}
|
|
36
40
|
jsonSchema(_input_1, jsonSchema_1) {
|
|
37
|
-
return tslib_1.__awaiter(this, arguments, void 0, function* (_input, jsonSchema, { instructions = '', model = 'gpt-4o', specs = [], embeddings = false, sample = 3, temperature = 0, maxRetry = 3, } = {}) {
|
|
38
|
-
const validator = new json_schema_library_1.Draft07(jsonSchema);
|
|
41
|
+
return tslib_1.__awaiter(this, arguments, void 0, function* (_input, jsonSchema, { instructions = '', model = 'gpt-4o', specs = [], embeddings = false, sample = 3, temperature = 0, maxRetry = 3, validator = defaultValidatorFactory(jsonSchema), } = {}) {
|
|
39
42
|
for (const spec of specs) {
|
|
40
|
-
const errors = validator
|
|
43
|
+
const errors = yield validator(spec.output);
|
|
41
44
|
if (errors.length > 0) {
|
|
42
45
|
throw new Error(JSON.stringify(errors, null, 2));
|
|
43
46
|
}
|
|
@@ -52,9 +55,9 @@ let AnyFuncService = class AnyFuncService {
|
|
|
52
55
|
model,
|
|
53
56
|
sample,
|
|
54
57
|
temperature,
|
|
55
|
-
})), (0, rxjs_1.tap)(message => messages.push(message)), (0, rxjs_1.
|
|
58
|
+
})), (0, rxjs_1.tap)(message => messages.push(message)), (0, rxjs_1.switchMap)((message) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
56
59
|
const output = JSON.parse(message.tool_calls[0].function.arguments);
|
|
57
|
-
const errors =
|
|
60
|
+
const errors = yield validator(output);
|
|
58
61
|
if (errors.length > 0) {
|
|
59
62
|
messages.push({
|
|
60
63
|
role: 'tool',
|
|
@@ -77,7 +80,7 @@ let AnyFuncService = class AnyFuncService {
|
|
|
77
80
|
}
|
|
78
81
|
}
|
|
79
82
|
return output;
|
|
80
|
-
}), (0, rxjs_1.catchError)((error) => {
|
|
83
|
+
})), (0, rxjs_1.catchError)((error) => {
|
|
81
84
|
console.error(error);
|
|
82
85
|
throw error;
|
|
83
86
|
}), (0, rxjs_1.retry)(maxRetry)));
|
|
@@ -85,8 +88,9 @@ let AnyFuncService = class AnyFuncService {
|
|
|
85
88
|
});
|
|
86
89
|
}
|
|
87
90
|
call(_input_1, args_1) {
|
|
88
|
-
return tslib_1.__awaiter(this, arguments, void 0, function* (_input, args, { instructions = '', model = 'gpt-4o', specs = [], embeddings = false, sample = 3, temperature = 0, maxRetry = 3, } = {}) {
|
|
89
|
-
|
|
91
|
+
return tslib_1.__awaiter(this, arguments, void 0, function* (_input, args, { instructions = '', model = 'gpt-4o', specs = [], embeddings = false, sample = 3, temperature = 0, maxRetry = 3, validator = defaultValidatorFactory((0, json_schema_1.targetConstructorToSchema)(args)), } = {}) {
|
|
92
|
+
const parameters = (0, json_schema_1.targetConstructorToSchema)(args);
|
|
93
|
+
return this.jsonSchema(_input, parameters, {
|
|
90
94
|
instructions,
|
|
91
95
|
model,
|
|
92
96
|
specs,
|
|
@@ -94,6 +98,7 @@ let AnyFuncService = class AnyFuncService {
|
|
|
94
98
|
sample,
|
|
95
99
|
temperature,
|
|
96
100
|
maxRetry,
|
|
101
|
+
validator,
|
|
97
102
|
});
|
|
98
103
|
});
|
|
99
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"any-func.service.impl.js","sourceRoot":"","sources":["../../../../../../packages/@nx-ddd/any-func/src/lib/any-func/any-func.service.impl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"any-func.service.impl.js","sourceRoot":"","sources":["../../../../../../packages/@nx-ddd/any-func/src/lib/any-func/any-func.service.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ exports.CacheAdapter = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const core_1 = require("@angular/core");
|
|
6
6
|
const node_localstorage_1 = require("node-localstorage");
|
|
7
|
-
const
|
|
7
|
+
const crypto_js_1 = tslib_1.__importDefault(require("crypto-js"));
|
|
8
8
|
let CacheAdapter = class CacheAdapter {
|
|
9
9
|
constructor() {
|
|
10
10
|
this.localStorage = global.localStorage || new node_localstorage_1.LocalStorage('node_modules/.cache/any-func', 5 * 1024 * 1024 * 1024);
|
|
@@ -34,7 +34,7 @@ let CacheAdapter = class CacheAdapter {
|
|
|
34
34
|
}
|
|
35
35
|
makeKey(keyOrObj) {
|
|
36
36
|
const value = typeof keyOrObj === 'string' ? keyOrObj : JSON.stringify(keyOrObj);
|
|
37
|
-
return
|
|
37
|
+
return crypto_js_1.default.SHA256(value).toString();
|
|
38
38
|
}
|
|
39
39
|
makeJson(valueOrObj) {
|
|
40
40
|
return JSON.stringify(valueOrObj);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.adapter.js","sourceRoot":"","sources":["../../../../../../../../packages/@nx-ddd/any-func/src/lib/impl/adapters/cache/cache.adapter.ts"],"names":[],"mappings":";;;;AAAA,wCAA2C;AAC3C,yDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"cache.adapter.js","sourceRoot":"","sources":["../../../../../../../../packages/@nx-ddd/any-func/src/lib/impl/adapters/cache/cache.adapter.ts"],"names":[],"mappings":";;;;AAAA,wCAA2C;AAC3C,yDAAiD;AACjD,kEAAiC;AAG1B,IAAM,YAAY,GAAlB,MAAM,YAAY;IAAlB;QACK,iBAAY,GAAiB,MAAM,CAAC,YAAY,IAAI,IAAI,gCAAY,CAAC,8BAA8B,EAAE,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;IAiCzI,CAAC;IA/BO,GAAG,CAAI,QAAyB;;YACpC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAa,CAAC;QACpE,CAAC;KAAA;IAEK,GAAG,CAAC,QAAyB,EAAE,KAAU;;YAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACnC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACvD,CAAC;KAAA;IAEK,IAAI,CAAiC,KAAQ,EAAE,QAAkC;;YACrF,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAChC,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAI,GAAG,CAAC,CAAC;YACnC,IAAI,KAAK;gBAAE,OAAO,KAAK,CAAC;YACxB,KAAK,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAC3B,OAAO,KAAK,CAAC;QACf,CAAC;KAAA;IAES,OAAO,CAAC,QAAyB;QACzC,MAAM,KAAK,GAAG,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACjF,OAAO,mBAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC3C,CAAC;IAES,QAAQ,CAAC,UAAe;QAChC,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IAES,SAAS,CAAC,KAAa;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;CACF,CAAA;AAlCY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,iBAAU,EAAC,EAAC,UAAU,EAAE,MAAM,EAAC,CAAC;GACpB,YAAY,CAkCxB"}
|
|
@@ -3,8 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.targetConstructorToSchema = targetConstructorToSchema;
|
|
4
4
|
const class_validator_1 = require("class-validator");
|
|
5
5
|
const class_validator_jsonschema_1 = require("class-validator-jsonschema");
|
|
6
|
+
// TODO(@NozomuMiyamoto): fix
|
|
6
7
|
// @ts-ignore
|
|
7
|
-
const { defaultMetadataStorage } = require('class-transformer/cjs/storage');
|
|
8
|
+
// const { defaultMetadataStorage } = require('class-transformer/cjs/storage');
|
|
9
|
+
// import { defaultMetadataStorage } from 'class-transformer/esm5/storage';
|
|
10
|
+
// 環境差異を吸収するため、try-catchでdynamic importしてdefaultMetadataStorageを取得します。
|
|
11
|
+
let defaultMetadataStorage;
|
|
12
|
+
try {
|
|
13
|
+
({ defaultMetadataStorage } = require('class-transformer/cjs/storage'));
|
|
14
|
+
}
|
|
15
|
+
catch (_a) {
|
|
16
|
+
({ defaultMetadataStorage } = require('class-transformer/esm5/storage'));
|
|
17
|
+
}
|
|
8
18
|
function getPropType(target, property) {
|
|
9
19
|
return Reflect.getMetadata('design:type', target, property);
|
|
10
20
|
}
|
|
@@ -35,6 +45,12 @@ const additionalConverters = {
|
|
|
35
45
|
return targetToSchema(childType, options);
|
|
36
46
|
}
|
|
37
47
|
},
|
|
48
|
+
isDayjs: (meta) => {
|
|
49
|
+
return {
|
|
50
|
+
type: 'string',
|
|
51
|
+
format: 'date-time', // JSON Schemaで日付型を指定
|
|
52
|
+
};
|
|
53
|
+
},
|
|
38
54
|
};
|
|
39
55
|
function targetConstructorToSchema(target, options = {}) {
|
|
40
56
|
return (0, class_validator_jsonschema_1.targetConstructorToSchema)(target, Object.assign(Object.assign({}, options), { additionalConverters, classTransformerMetadataStorage: defaultMetadataStorage }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-schema.js","sourceRoot":"","sources":["../../../../../../../packages/@nx-ddd/any-func/src/lib/impl/json-schema/json-schema.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"json-schema.js","sourceRoot":"","sources":["../../../../../../../packages/@nx-ddd/any-func/src/lib/impl/json-schema/json-schema.ts"],"names":[],"mappings":";;AAgEA,8DAMC;AAtED,qDAAiD;AACjD,2EAAoG;AAGpG,6BAA6B;AAC7B,aAAa;AACb,+EAA+E;AAC/E,2EAA2E;AAE3E,sEAAsE;AACtE,IAAI,sBAAgF,CAAC;AACrF,IAAI,CAAC;IACH,CAAC,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC,CAAC;AAC1E,CAAC;AAAC,WAAM,CAAC;IACP,CAAC,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,SAAS,WAAW,CAAC,MAAc,EAAE,QAAgB;IACnD,OAAO,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;AAC7D,CAAC;AAED,SAAS,cAAc,CACrB,IAAS,EACT,OAAY;IAEZ,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,IACE,IAAI,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS;YACnC,IAAI,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS,EACnC,CAAC;YACD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;QAC3B,CAAC;aAAM,IAAI,IAAI,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS,EAAE,CAAC;YAC/C,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;QAC3B,CAAC;aAAM,IAAI,IAAI,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS,EAAE,CAAC;YAChD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAA;QAC5B,CAAC;QAED,OAAO,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IACjD,CAAC;AACH,CAAC;AAED,MAAM,oBAAoB,GAAE;IAC1B,CAAC,iCAAe,CAAC,iBAAiB,CAAC,EAAE,CAAC,IAAS,EAAE,OAAY,EAAE,EAAE;QAC/D,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,+BAA+B;gBACtD,CAAC,CAAC,OAAO,CAAC,+BAA+B,CAAC,gBAAgB,CACtD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,YAAY,CAClB;gBACH,CAAC,CAAC,IAAI,CAAA;YACR,MAAM,SAAS,GAAG,QAAQ;gBACxB,CAAC,CAAC,QAAQ,CAAC,YAAY,EAAE;gBACzB,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;YACzD,OAAO,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAC3C,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAC,IAAS,EAAe,EAAE;QAClC,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,WAAW,EAAE,qBAAqB;SAC3C,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,SAAgB,yBAAyB,CAAC,MAAgB,EAAE,UAA6B,EAAE;IACzF,OAAO,IAAA,sDAA0B,EAAC,MAAM,kCACnC,OAAO,KACV,oBAAoB,EACpB,+BAA+B,EAAE,sBAAsB,IACvD,CAAC;AACL,CAAC"}
|
package/lib/index.d.ts
CHANGED
package/lib/index.js
CHANGED
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/@nx-ddd/any-func/src/lib/index.ts"],"names":[],"mappings":";;;AAAA,qDAA2B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/@nx-ddd/any-func/src/lib/index.ts"],"names":[],"mappings":";;;AAAA,qDAA2B;AAC3B,iDAAuB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx-ddd/any-func",
|
|
3
|
-
"version": "18.
|
|
3
|
+
"version": "18.4.0",
|
|
4
4
|
"main": "./index.js",
|
|
5
5
|
"types": "./index.d.ts",
|
|
6
6
|
"homepage": "https://github.com/xx-machina/plaform/tree/main/packages/@nx-ddd/any-func",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
},
|
|
11
11
|
"peerDependencies": {
|
|
12
12
|
"@angular/core": "^18.0.0",
|
|
13
|
-
"@nx-ddd/common": "18.
|
|
13
|
+
"@nx-ddd/common": "18.4.0",
|
|
14
14
|
"class-transformer": "^0.5.1",
|
|
15
15
|
"class-validator": "^0.14.0",
|
|
16
16
|
"class-validator-jsonschema": "^5.0.0",
|