@comake/skl-js-engine 1.3.16 → 1.4.1
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/dist/SklEngine.d.ts +1 -1
- package/dist/SklEngine.d.ts.map +1 -1
- package/dist/SklEngine.js +5 -6
- package/dist/SklEngine.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/logger.js +1 -1
- package/dist/logger.js.map +1 -1
- package/dist/storage/FindOperator.d.ts +1 -1
- package/dist/storage/FindOperator.d.ts.map +1 -1
- package/dist/storage/FindOperator.js.map +1 -1
- package/dist/storage/FindOptionsTypes.d.ts +3 -1
- package/dist/storage/FindOptionsTypes.d.ts.map +1 -1
- package/dist/storage/FindOptionsTypes.js.map +1 -1
- package/dist/storage/operator/Or.d.ts +4 -0
- package/dist/storage/operator/Or.d.ts.map +1 -0
- package/dist/storage/operator/Or.js +13 -0
- package/dist/storage/operator/Or.js.map +1 -0
- package/dist/storage/query-adapter/sparql/SparqlQueryBuilder.d.ts +2 -0
- package/dist/storage/query-adapter/sparql/SparqlQueryBuilder.d.ts.map +1 -1
- package/dist/storage/query-adapter/sparql/SparqlQueryBuilder.js +54 -0
- package/dist/storage/query-adapter/sparql/SparqlQueryBuilder.js.map +1 -1
- package/package.json +1 -1
- package/src/SklEngine.ts +6 -7
- package/src/index.ts +1 -0
- package/src/logger.ts +1 -1
- package/src/storage/FindOperator.ts +1 -0
- package/src/storage/FindOptionsTypes.ts +3 -1
- package/src/storage/operator/Or.ts +11 -0
- package/src/storage/query-adapter/sparql/SparqlQueryBuilder.ts +74 -2
package/dist/SklEngine.d.ts
CHANGED
|
@@ -21,10 +21,10 @@ export declare class SKLEngine implements SKLEngineInterface {
|
|
|
21
21
|
private readonly globalCallbacks?;
|
|
22
22
|
private readonly disableValidation?;
|
|
23
23
|
readonly capability: CapabilityInterface;
|
|
24
|
-
private readonly isDebugMode;
|
|
25
24
|
private codeExecutor;
|
|
26
25
|
private readonly skdsEndpointUrl;
|
|
27
26
|
private readonly scriptPath;
|
|
27
|
+
private readonly logger;
|
|
28
28
|
constructor(options: SklEngineOptions);
|
|
29
29
|
setCodeExecutor(codeExecutor: ICodeExecutor): void;
|
|
30
30
|
executeRawQuery<T extends RawQueryResult>(query: string): Promise<T[]>;
|
package/dist/SklEngine.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SklEngine.d.ts","sourceRoot":"","sources":["../src/SklEngine.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAqB,WAAW,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAgBhD,OAAO,EAAE,WAAW,EAAyB,MAAM,qBAAqB,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnG,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAQlF,OAAO,KAAK,EAAgB,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAIzF,OAAO,KAAK,EAEV,UAAU,EACV,gBAAgB,EAEhB,MAAM,EACN,UAAU,EACV,SAAS,EACT,OAAO,EAOP,OAAO,EAGP,kBAAkB,EAEnB,MAAM,cAAc,CAAC;AAItB,oBAAY,iBAAiB,GAAG,CAAC,CAAC,SAAS,OAAO,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,EAClF,MAAM,EAAE,UAAU,EAClB,gBAAgB,CAAC,EAAE,gBAAgB,KAChC,OAAO,CAAC,CAAC,CAAC,CAAC;AAChB,oBAAY,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;AAEpE,oBAAY,qBAAqB,CAAC,CAAC,SAAS,OAAO,IAAI,CAAC,SAAS,IAAI,GAAG,UAAU,GAAG,UAAU,CAAC;AAEhG,oBAAY,YAAY,GAAG;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAErD,qBAAa,SAAU,YAAW,kBAAkB;IAClD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAA6C;IACxE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAyB;IACrD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAY;IAC7C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAU;IAC7C,SAAgB,UAAU,EAAE,mBAAmB,CAAC;IAChD,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"SklEngine.d.ts","sourceRoot":"","sources":["../src/SklEngine.ts"],"names":[],"mappings":"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"}
|
package/dist/SklEngine.js
CHANGED
|
@@ -47,8 +47,7 @@ class SKLEngine {
|
|
|
47
47
|
}
|
|
48
48
|
]));
|
|
49
49
|
}
|
|
50
|
-
this.
|
|
51
|
-
logger_1.Logger.getInstance(this.isDebugMode);
|
|
50
|
+
this.logger = logger_1.Logger.getInstance(options.debugMode);
|
|
52
51
|
// eslint-disable-next-line func-style
|
|
53
52
|
const getCapabilityHandler = (getTarget, property) => async (capabilityArgs, capabilityConfig) => this.executeCapabilityByName(property, capabilityArgs, capabilityConfig);
|
|
54
53
|
this.capability = new Proxy({}, { get: getCapabilityHandler });
|
|
@@ -447,11 +446,11 @@ class SKLEngine {
|
|
|
447
446
|
async executeCapability(capability, capabilityArgs, capabilityConfig) {
|
|
448
447
|
this.globalCallbacks?.onCapabilityStart?.(capability[constants_1.PROP_ENTITY_ID], capabilityArgs);
|
|
449
448
|
if (capabilityConfig?.callbacks?.onCapabilityStart) {
|
|
450
|
-
|
|
449
|
+
this.logger.debug('Capability arguments', capabilityArgs);
|
|
451
450
|
capabilityConfig.callbacks.onCapabilityStart(capability[constants_1.PROP_ENTITY_ID], capabilityArgs);
|
|
452
451
|
}
|
|
453
452
|
const { mapping, account } = await this.findMappingForCapabilityContextually(capability[constants_1.PROP_ENTITY_ID], capabilityArgs);
|
|
454
|
-
|
|
453
|
+
this.logger.debug('Mapping', JSON.stringify(mapping));
|
|
455
454
|
const shouldValidate = this.shouldValidate(capabilityConfig);
|
|
456
455
|
if (shouldValidate) {
|
|
457
456
|
await this.assertCapabilityParamsMatchParameterSchemas(capabilityArgs, capability);
|
|
@@ -540,7 +539,7 @@ class SKLEngine {
|
|
|
540
539
|
// returnValue = await this.executeCapabilityMapping(mapping, args, mappedArgs, capabilityConfig);
|
|
541
540
|
// } else {
|
|
542
541
|
const mappedArgs = await this.performParameterMappingOnArgsIfDefined(args, mapping, capabilityConfig);
|
|
543
|
-
|
|
542
|
+
this.logger.debug('Mapped args', mappedArgs);
|
|
544
543
|
if (constants_1.EngineConstants.prop.operationId in mapping || constants_1.EngineConstants.prop.operationMapping in mapping) {
|
|
545
544
|
returnValue = (await this.executeOperationMapping(mapping, mappedArgs, args, account, capabilityConfig));
|
|
546
545
|
}
|
|
@@ -568,7 +567,7 @@ class SKLEngine {
|
|
|
568
567
|
const operationInfo = await this.performOperationMappingWithArgs(originalArgs, mapping, capabilityConfig);
|
|
569
568
|
const response = await this.performOperation(operationInfo, mappedArgs, originalArgs, account, capabilityConfig);
|
|
570
569
|
if (!this.ifCapabilityStreaming(capabilityConfig)) {
|
|
571
|
-
|
|
570
|
+
this.logger.debug('Original response', JSON.stringify(response));
|
|
572
571
|
}
|
|
573
572
|
return response;
|
|
574
573
|
}
|