@xylabs/creatable 4.12.13 → 4.12.15
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/neutral/index.mjs +5 -4
- package/dist/neutral/index.mjs.map +1 -1
- package/dist/types/AbstractCreatable.d.ts +4 -4
- package/dist/types/AbstractCreatable.d.ts.map +1 -1
- package/dist/types/Creatable.d.ts +5 -4
- package/dist/types/Creatable.d.ts.map +1 -1
- package/dist/types/model/CreatableInstance.d.ts +2 -2
- package/dist/types/model/CreatableInstance.d.ts.map +1 -1
- package/dist/types/model/CreatableParams.d.ts +3 -3
- package/dist/types/model/CreatableParams.d.ts.map +1 -1
- package/package.json +8 -8
- package/src/AbstractCreatable.ts +13 -9
- package/src/Creatable.ts +9 -4
- package/src/model/CreatableInstance.ts +3 -3
- package/src/model/CreatableParams.ts +3 -3
package/dist/neutral/index.mjs
CHANGED
|
@@ -51,16 +51,17 @@ var AbstractCreatable = class extends BaseEmitter {
|
|
|
51
51
|
params.statusReporter?.report(name, "creating");
|
|
52
52
|
try {
|
|
53
53
|
const instance = new this(params);
|
|
54
|
-
await
|
|
54
|
+
const initializedInstance = await this.createHandler(instance);
|
|
55
55
|
params.statusReporter?.report(name, "created");
|
|
56
|
-
return
|
|
56
|
+
return initializedInstance;
|
|
57
57
|
} catch (ex) {
|
|
58
58
|
params.statusReporter?.report(name, "error", isError(ex) ? ex : new Error(`Error creating: ${name}`));
|
|
59
59
|
throw new Error(`Error creating: ${name}`);
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
|
-
|
|
63
|
-
|
|
62
|
+
/* override this for initialization of instance */
|
|
63
|
+
static createHandler(instance) {
|
|
64
|
+
return instance;
|
|
64
65
|
}
|
|
65
66
|
async start() {
|
|
66
67
|
this._noOverride("start");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/AbstractCreatable.ts","../../src/lib/getFunctionName.ts","../../src/lib/getRootFunction.ts","../../src/Creatable.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport type { EventData } from '@xylabs/events'\nimport { BaseEmitter } from '@xylabs/events'\nimport { type Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type { Promisable } from '@xylabs/promise'\nimport { isError } from '@xylabs/typeof'\n\nimport type { Creatable } from './Creatable.ts'\nimport { getFunctionName, getRootFunction } from './lib/index.ts'\nimport type {\n CreatableInstance, CreatableName, CreatableParams,\n} from './model/index.ts'\n\nexport abstract class AbstractCreatable<TParams extends
|
|
1
|
+
{"version":3,"sources":["../../src/AbstractCreatable.ts","../../src/lib/getFunctionName.ts","../../src/lib/getRootFunction.ts","../../src/Creatable.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport type { EventData } from '@xylabs/events'\nimport { BaseEmitter } from '@xylabs/events'\nimport { type Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type { Promisable } from '@xylabs/promise'\nimport { isError } from '@xylabs/typeof'\n\nimport type { Creatable } from './Creatable.ts'\nimport { getFunctionName, getRootFunction } from './lib/index.ts'\nimport type {\n CreatableInstance, CreatableName, CreatableParams,\n} from './model/index.ts'\n\nexport abstract class AbstractCreatable<TParams extends CreatableParams = CreatableParams,\n TEventData extends EventData = EventData> extends BaseEmitter<Partial<TParams>, TEventData> {\n defaultLogger?: Logger\n name: CreatableName\n\n private _populatedParams: TParams | undefined\n\n constructor(params: Partial<TParams>) {\n super(params)\n this.name = params.name ?? this.constructor.name as CreatableName\n }\n\n override get params(): CreatableParams<TParams> {\n this._noOverride()\n this._populatedParams = this._populatedParams ?? this.paramsHandler(super.params)\n return this._populatedParams\n }\n\n get statusReporter() {\n return this.params.statusReporter\n }\n\n static async create<T extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams>(\n this: Creatable<T, TParams>,\n params: Partial<CreatableParams<TParams>>,\n ): Promise<CreatableInstance<T>> {\n const name: CreatableName = params.name ?? this.name\n params.statusReporter?.report(name, 'creating')\n try {\n const instance = new this(params)\n const initializedInstance = await this.createHandler(instance)\n params.statusReporter?.report(name, 'created')\n return initializedInstance\n } catch (ex) {\n params.statusReporter?.report(name, 'error', isError(ex) ? ex : new Error(`Error creating: ${name}`))\n throw new Error(`Error creating: ${name}`)\n }\n }\n\n /* override this for initialization of instance */\n static createHandler<T extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams>(\n this: Creatable<T, TParams>,\n instance: CreatableInstance<T>,\n ): Promisable<CreatableInstance<T>> {\n return instance\n }\n\n async start(): Promise<boolean> {\n this._noOverride('start')\n try {\n this.statusReporter?.report(this.name, 'starting')\n await this.startHandler()\n this.statusReporter?.report(this.name, 'started')\n return true\n } catch (ex) {\n this.statusReporter?.report(this.name, 'error', isError(ex) ? ex : new Error(`Error stopping: ${ex}`))\n return false\n }\n }\n\n async stop(): Promise<boolean> {\n this._noOverride('stop')\n try {\n this.statusReporter?.report(this.name, 'stopping')\n await this.stopHandler()\n this.statusReporter?.report(this.name, 'stopped')\n return true\n } catch (ex) {\n this.statusReporter?.report(this.name, 'error', isError(ex) ? ex : new Error(`Error stopping: ${ex}`))\n return false\n }\n }\n\n protected _noOverride(functionName = getFunctionName(3)) {\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n const thisFunc = (this as any)[functionName]\n\n const rootFunc = getRootFunction(this, functionName)\n assertEx(thisFunc === rootFunc, () => `Override not allowed for [${functionName}] - override ${functionName}Handler instead`)\n }\n\n protected startHandler(): Promisable<void> {\n // when overriding this, throw an error on failure\n }\n\n protected stopHandler(): Promisable<void> {\n // when overriding this, throw an error on failure\n }\n\n protected abstract paramsHandler(params?: Partial<CreatableParams<TParams>>): CreatableParams<TParams>\n}\n","import { isNumber } from '@xylabs/typeof'\n\nexport function getFunctionName(depth = 2) {\n const error = new Error('Stack')\n let newIndex: number | undefined\n const stackParts = error.stack?.split('\\n')[depth]?.split(' ')\n const funcName\n = stackParts?.find((item, index) => {\n if (item.length > 0 && item !== 'at') {\n // check if constructor\n if (item === 'new') {\n newIndex = index\n }\n return true\n }\n }) ?? '<unknown>'\n return isNumber(newIndex) ? `${funcName} ${stackParts?.[newIndex + 1]}` : funcName\n}\n","export function getRootFunction(obj: unknown, funcName: string) {\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n let anyObj = obj as any\n while (anyObj.__proto__?.[funcName]) {\n anyObj = anyObj.__proto__\n }\n return anyObj[funcName]\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\n\nimport type { AbstractCreatable } from './AbstractCreatable.ts'\nimport type { CreatableInstance, CreatableParams } from './model/index.ts'\n\n/*\nexport interface CreatableFactory<T extends EmptyObject | void = void,\n TParams extends EmptyObject | void = void> {\n create(params?: CreatableParams<TParams>): Promise<CreatableInstance<T>>\n}\n*/\n\nexport interface Creatable<T extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams> {\n\n defaultLogger?: Logger\n\n new (params: Partial<TParams>): CreatableInstance<T, TParams> & AbstractCreatable<TParams>\n\n create<T extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams>(\n this: Creatable<T, TParams>,\n params: Partial<CreatableParams<TParams>>): Promise<CreatableInstance<T>>\n\n createHandler<T extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams>(\n this: Creatable<T, TParams>,\n instance: CreatableInstance<T>\n ): Promise<CreatableInstance<T>>\n\n /*\n factory<T extends EmptyObject | void = void,\n TParams extends EmptyObject | void = void> (this: Creatable<T, TParams>, params: Partial<CreatableParams<TParams>>): CreatableFactory<T, TParams>\n */\n}\n\n/**\n * Class annotation to be used to decorate Modules which support\n * an asynchronous creation pattern\n * @returns The decorated Module requiring it implement the members\n * of the CreatableModule as statics properties/methods\n */\nexport function creatable<TInstance extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams>() {\n return <U extends Creatable<TInstance, TParams>>(constructor: U) => {\n // eslint-disable-next-line @typescript-eslint/no-unused-expressions\n constructor\n }\n}\n\n/**\n * Class annotation to be used to decorate Modules which support\n * an asynchronous creation factory pattern\n * @returns The decorated Module requiring it implement the members\n * of the CreatableModule as statics properties/methods\n */\n\n/*\nexport function creatableFactory() {\n return <U extends CreatableFactory>(constructor: U) => {\n // eslint-disable-next-line @typescript-eslint/no-unused-expressions\n constructor\n }\n}\n*/\n"],"mappings":"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","names":[]}
|
|
@@ -5,15 +5,15 @@ import type { EmptyObject } from '@xylabs/object';
|
|
|
5
5
|
import type { Promisable } from '@xylabs/promise';
|
|
6
6
|
import type { Creatable } from './Creatable.ts';
|
|
7
7
|
import type { CreatableInstance, CreatableName, CreatableParams } from './model/index.ts';
|
|
8
|
-
export declare abstract class AbstractCreatable<TParams extends
|
|
8
|
+
export declare abstract class AbstractCreatable<TParams extends CreatableParams = CreatableParams, TEventData extends EventData = EventData> extends BaseEmitter<Partial<TParams>, TEventData> {
|
|
9
9
|
defaultLogger?: Logger;
|
|
10
10
|
name: CreatableName;
|
|
11
11
|
private _populatedParams;
|
|
12
|
-
constructor(params: Partial<
|
|
12
|
+
constructor(params: Partial<TParams>);
|
|
13
13
|
get params(): CreatableParams<TParams>;
|
|
14
14
|
get statusReporter(): import("./model/CreatableStatusReporter.ts").CreatableStatusReporter | undefined;
|
|
15
|
-
static create<T extends EmptyObject | void = void, TParams extends
|
|
16
|
-
createHandler(): Promisable<
|
|
15
|
+
static create<T extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams>(this: Creatable<T, TParams>, params: Partial<CreatableParams<TParams>>): Promise<CreatableInstance<T>>;
|
|
16
|
+
static createHandler<T extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams>(this: Creatable<T, TParams>, instance: CreatableInstance<T>): Promisable<CreatableInstance<T>>;
|
|
17
17
|
start(): Promise<boolean>;
|
|
18
18
|
stop(): Promise<boolean>;
|
|
19
19
|
protected _noOverride(functionName?: string): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractCreatable.d.ts","sourceRoot":"","sources":["../../src/AbstractCreatable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAGjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE/C,OAAO,KAAK,EACV,iBAAiB,EAAE,aAAa,EAAE,eAAe,EAClD,MAAM,kBAAkB,CAAA;AAEzB,8BAAsB,iBAAiB,CAAC,OAAO,SAAS,
|
|
1
|
+
{"version":3,"file":"AbstractCreatable.d.ts","sourceRoot":"","sources":["../../src/AbstractCreatable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAGjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE/C,OAAO,KAAK,EACV,iBAAiB,EAAE,aAAa,EAAE,eAAe,EAClD,MAAM,kBAAkB,CAAA;AAEzB,8BAAsB,iBAAiB,CAAC,OAAO,SAAS,eAAe,GAAG,eAAe,EACvF,UAAU,SAAS,SAAS,GAAG,SAAS,CAAE,SAAQ,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC;IAC3F,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,IAAI,EAAE,aAAa,CAAA;IAEnB,OAAO,CAAC,gBAAgB,CAAqB;gBAEjC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC;IAKpC,IAAa,MAAM,IAAI,eAAe,CAAC,OAAO,CAAC,CAI9C;IAED,IAAI,cAAc,qFAEjB;WAEY,MAAM,CAAC,CAAC,SAAS,WAAW,GAAG,IAAI,GAAG,IAAI,EAAE,OAAO,SAAS,eAAe,GAAG,eAAe,EACxG,IAAI,EAAE,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,EAC3B,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,GACxC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAehC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,WAAW,GAAG,IAAI,GAAG,IAAI,EAAE,OAAO,SAAS,eAAe,GAAG,eAAe,EACzG,IAAI,EAAE,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,EAC3B,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAC7B,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAI7B,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;IAazB,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC;IAa9B,SAAS,CAAC,WAAW,CAAC,YAAY,SAAqB;IAQvD,SAAS,CAAC,YAAY,IAAI,UAAU,CAAC,IAAI,CAAC;IAI1C,SAAS,CAAC,WAAW,IAAI,UAAU,CAAC,IAAI,CAAC;IAIzC,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC;CACvG"}
|
|
@@ -2,10 +2,11 @@ import type { Logger } from '@xylabs/logger';
|
|
|
2
2
|
import type { EmptyObject } from '@xylabs/object';
|
|
3
3
|
import type { AbstractCreatable } from './AbstractCreatable.ts';
|
|
4
4
|
import type { CreatableInstance, CreatableParams } from './model/index.ts';
|
|
5
|
-
export interface Creatable<T extends EmptyObject | void = void, TParams extends
|
|
5
|
+
export interface Creatable<T extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams> {
|
|
6
6
|
defaultLogger?: Logger;
|
|
7
|
-
new (params: Partial<
|
|
8
|
-
create<T extends EmptyObject | void = void, TParams extends
|
|
7
|
+
new (params: Partial<TParams>): CreatableInstance<T, TParams> & AbstractCreatable<TParams>;
|
|
8
|
+
create<T extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams>(this: Creatable<T, TParams>, params: Partial<CreatableParams<TParams>>): Promise<CreatableInstance<T>>;
|
|
9
|
+
createHandler<T extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams>(this: Creatable<T, TParams>, instance: CreatableInstance<T>): Promise<CreatableInstance<T>>;
|
|
9
10
|
}
|
|
10
11
|
/**
|
|
11
12
|
* Class annotation to be used to decorate Modules which support
|
|
@@ -13,7 +14,7 @@ export interface Creatable<T extends EmptyObject | void = void, TParams extends
|
|
|
13
14
|
* @returns The decorated Module requiring it implement the members
|
|
14
15
|
* of the CreatableModule as statics properties/methods
|
|
15
16
|
*/
|
|
16
|
-
export declare function creatable<TInstance extends EmptyObject | void = void, TParams extends
|
|
17
|
+
export declare function creatable<TInstance extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams>(): <U extends Creatable<TInstance, TParams>>(constructor: U) => void;
|
|
17
18
|
/**
|
|
18
19
|
* Class annotation to be used to decorate Modules which support
|
|
19
20
|
* an asynchronous creation factory pattern
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Creatable.d.ts","sourceRoot":"","sources":["../../src/Creatable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAEjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAS1E,MAAM,WAAW,SAAS,CAAC,CAAC,SAAS,WAAW,GAAG,IAAI,GAAG,IAAI,EAAE,OAAO,SAAS,
|
|
1
|
+
{"version":3,"file":"Creatable.d.ts","sourceRoot":"","sources":["../../src/Creatable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAEjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAS1E,MAAM,WAAW,SAAS,CAAC,CAAC,SAAS,WAAW,GAAG,IAAI,GAAG,IAAI,EAAE,OAAO,SAAS,eAAe,GAAG,eAAe;IAE/G,aAAa,CAAC,EAAE,MAAM,CAAA;IAEtB,KAAK,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,iBAAiB,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAA;IAE1F,MAAM,CAAC,CAAC,SAAS,WAAW,GAAG,IAAI,GAAG,IAAI,EAAE,OAAO,SAAS,eAAe,GAAG,eAAe,EAC3F,IAAI,EAAE,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,EAC3B,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAA;IAE3E,aAAa,CAAC,CAAC,SAAS,WAAW,GAAG,IAAI,GAAG,IAAI,EAAE,OAAO,SAAS,eAAe,GAAG,eAAe,EAClG,IAAI,EAAE,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,EAC3B,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAC7B,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAA;CAMjC;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,SAAS,SAAS,WAAW,GAAG,IAAI,GAAG,IAAI,EAAE,OAAO,SAAS,eAAe,GAAG,eAAe,MAC9G,CAAC,SAAS,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,UAIhE;AAED;;;;;GAKG"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import type { EventData } from '@xylabs/events';
|
|
2
2
|
import type { EmptyObject } from '@xylabs/object';
|
|
3
3
|
import type { CreatableName, CreatableParams } from './CreatableParams.ts';
|
|
4
|
-
export interface CreatableInstanceFields<TParams extends
|
|
4
|
+
export interface CreatableInstanceFields<TParams extends CreatableParams = CreatableParams, TEventData extends EventData = EventData> {
|
|
5
5
|
eventData: TEventData;
|
|
6
6
|
name: CreatableName;
|
|
7
7
|
params: CreatableParams<TParams>;
|
|
8
8
|
}
|
|
9
|
-
export type CreatableInstance<T extends EmptyObject | void = void, TParams extends
|
|
9
|
+
export type CreatableInstance<T extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams, TEventData extends EventData = EventData> = T extends void ? CreatableInstanceFields<TParams, TEventData> : (T & CreatableInstanceFields<TParams, TEventData>);
|
|
10
10
|
//# sourceMappingURL=CreatableInstance.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreatableInstance.d.ts","sourceRoot":"","sources":["../../../src/model/CreatableInstance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAEjD,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAE1E,MAAM,WAAW,uBAAuB,CAAC,OAAO,SAAS,
|
|
1
|
+
{"version":3,"file":"CreatableInstance.d.ts","sourceRoot":"","sources":["../../../src/model/CreatableInstance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAEjD,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAE1E,MAAM,WAAW,uBAAuB,CAAC,OAAO,SAAS,eAAe,GAAG,eAAe,EAAE,UAAU,SAAS,SAAS,GAAG,SAAS;IAClI,SAAS,EAAE,UAAU,CAAA;IACrB,IAAI,EAAE,aAAa,CAAA;IACnB,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,CAAA;CACjC;AAED,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,WAAW,GAAG,IAAI,GAAG,IAAI,EAAE,OAAO,SAAS,eAAe,GAAG,eAAe,EAAE,UAAU,SAAS,SAAS,GAAG,SAAS,IAC1J,CAAC,SAAS,IAAI,GAAG,uBAAuB,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,uBAAuB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAA"}
|
|
@@ -3,9 +3,9 @@ import type { BaseEmitterParams } from '@xylabs/events';
|
|
|
3
3
|
import type { EmptyObject } from '@xylabs/object';
|
|
4
4
|
import type { CreatableStatusReporter } from './CreatableStatusReporter.ts';
|
|
5
5
|
export type CreatableName = Exclude<string, 'creatable-name-reserved-32546239486'> & BaseClassName;
|
|
6
|
-
export
|
|
6
|
+
export interface CreatableParamsFields {
|
|
7
7
|
name: CreatableName;
|
|
8
8
|
statusReporter?: CreatableStatusReporter;
|
|
9
|
-
}
|
|
10
|
-
export type CreatableParams<TAdditionalParams extends EmptyObject
|
|
9
|
+
}
|
|
10
|
+
export type CreatableParams<TAdditionalParams extends EmptyObject = EmptyObject> = BaseEmitterParams<TAdditionalParams & CreatableParamsFields>;
|
|
11
11
|
//# sourceMappingURL=CreatableParams.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreatableParams.d.ts","sourceRoot":"","sources":["../../../src/model/CreatableParams.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAEjD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AAE3E,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,qCAAqC,CAAC,GAAG,aAAa,CAAA;AAElG,MAAM,
|
|
1
|
+
{"version":3,"file":"CreatableParams.d.ts","sourceRoot":"","sources":["../../../src/model/CreatableParams.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAEjD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AAE3E,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,qCAAqC,CAAC,GAAG,aAAa,CAAA;AAElG,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,aAAa,CAAA;IACnB,cAAc,CAAC,EAAE,uBAAuB,CAAA;CACzC;AAED,MAAM,MAAM,eAAe,CAAC,iBAAiB,SAAS,WAAW,GAAG,WAAW,IAC3E,iBAAiB,CAAC,iBAAiB,GAAG,qBAAqB,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xylabs/creatable",
|
|
3
|
-
"version": "4.12.
|
|
3
|
+
"version": "4.12.15",
|
|
4
4
|
"description": "Primary SDK for using XYO Protocol 2.0",
|
|
5
5
|
"homepage": "https://xyo.network",
|
|
6
6
|
"bugs": {
|
|
@@ -29,13 +29,13 @@
|
|
|
29
29
|
"module": "dist/neutral/index.mjs",
|
|
30
30
|
"types": "dist/types/index.d.ts",
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@xylabs/assert": "^4.12.
|
|
33
|
-
"@xylabs/base": "^4.12.
|
|
34
|
-
"@xylabs/events": "^4.12.
|
|
35
|
-
"@xylabs/logger": "^4.12.
|
|
36
|
-
"@xylabs/object": "^4.12.
|
|
37
|
-
"@xylabs/promise": "^4.12.
|
|
38
|
-
"@xylabs/typeof": "^4.12.
|
|
32
|
+
"@xylabs/assert": "^4.12.15",
|
|
33
|
+
"@xylabs/base": "^4.12.15",
|
|
34
|
+
"@xylabs/events": "^4.12.15",
|
|
35
|
+
"@xylabs/logger": "^4.12.15",
|
|
36
|
+
"@xylabs/object": "^4.12.15",
|
|
37
|
+
"@xylabs/promise": "^4.12.15",
|
|
38
|
+
"@xylabs/typeof": "^4.12.15"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
41
|
"@xylabs/ts-scripts-yarn3": "^6.5.9",
|
package/src/AbstractCreatable.ts
CHANGED
|
@@ -12,14 +12,14 @@ import type {
|
|
|
12
12
|
CreatableInstance, CreatableName, CreatableParams,
|
|
13
13
|
} from './model/index.ts'
|
|
14
14
|
|
|
15
|
-
export abstract class AbstractCreatable<TParams extends
|
|
16
|
-
TEventData extends EventData = EventData> extends BaseEmitter<Partial<
|
|
15
|
+
export abstract class AbstractCreatable<TParams extends CreatableParams = CreatableParams,
|
|
16
|
+
TEventData extends EventData = EventData> extends BaseEmitter<Partial<TParams>, TEventData> {
|
|
17
17
|
defaultLogger?: Logger
|
|
18
18
|
name: CreatableName
|
|
19
19
|
|
|
20
|
-
private _populatedParams:
|
|
20
|
+
private _populatedParams: TParams | undefined
|
|
21
21
|
|
|
22
|
-
constructor(params: Partial<
|
|
22
|
+
constructor(params: Partial<TParams>) {
|
|
23
23
|
super(params)
|
|
24
24
|
this.name = params.name ?? this.constructor.name as CreatableName
|
|
25
25
|
}
|
|
@@ -34,7 +34,7 @@ export abstract class AbstractCreatable<TParams extends EmptyObject | void = voi
|
|
|
34
34
|
return this.params.statusReporter
|
|
35
35
|
}
|
|
36
36
|
|
|
37
|
-
static async create<T extends EmptyObject | void = void, TParams extends
|
|
37
|
+
static async create<T extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams>(
|
|
38
38
|
this: Creatable<T, TParams>,
|
|
39
39
|
params: Partial<CreatableParams<TParams>>,
|
|
40
40
|
): Promise<CreatableInstance<T>> {
|
|
@@ -42,17 +42,21 @@ export abstract class AbstractCreatable<TParams extends EmptyObject | void = voi
|
|
|
42
42
|
params.statusReporter?.report(name, 'creating')
|
|
43
43
|
try {
|
|
44
44
|
const instance = new this(params)
|
|
45
|
-
await
|
|
45
|
+
const initializedInstance = await this.createHandler(instance)
|
|
46
46
|
params.statusReporter?.report(name, 'created')
|
|
47
|
-
return
|
|
47
|
+
return initializedInstance
|
|
48
48
|
} catch (ex) {
|
|
49
49
|
params.statusReporter?.report(name, 'error', isError(ex) ? ex : new Error(`Error creating: ${name}`))
|
|
50
50
|
throw new Error(`Error creating: ${name}`)
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
-
|
|
55
|
-
|
|
54
|
+
/* override this for initialization of instance */
|
|
55
|
+
static createHandler<T extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams>(
|
|
56
|
+
this: Creatable<T, TParams>,
|
|
57
|
+
instance: CreatableInstance<T>,
|
|
58
|
+
): Promisable<CreatableInstance<T>> {
|
|
59
|
+
return instance
|
|
56
60
|
}
|
|
57
61
|
|
|
58
62
|
async start(): Promise<boolean> {
|
package/src/Creatable.ts
CHANGED
|
@@ -11,16 +11,21 @@ export interface CreatableFactory<T extends EmptyObject | void = void,
|
|
|
11
11
|
}
|
|
12
12
|
*/
|
|
13
13
|
|
|
14
|
-
export interface Creatable<T extends EmptyObject | void = void, TParams extends
|
|
14
|
+
export interface Creatable<T extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams> {
|
|
15
15
|
|
|
16
16
|
defaultLogger?: Logger
|
|
17
17
|
|
|
18
|
-
new (params: Partial<
|
|
18
|
+
new (params: Partial<TParams>): CreatableInstance<T, TParams> & AbstractCreatable<TParams>
|
|
19
19
|
|
|
20
|
-
create<T extends EmptyObject | void = void, TParams extends
|
|
20
|
+
create<T extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams>(
|
|
21
21
|
this: Creatable<T, TParams>,
|
|
22
22
|
params: Partial<CreatableParams<TParams>>): Promise<CreatableInstance<T>>
|
|
23
23
|
|
|
24
|
+
createHandler<T extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams>(
|
|
25
|
+
this: Creatable<T, TParams>,
|
|
26
|
+
instance: CreatableInstance<T>
|
|
27
|
+
): Promise<CreatableInstance<T>>
|
|
28
|
+
|
|
24
29
|
/*
|
|
25
30
|
factory<T extends EmptyObject | void = void,
|
|
26
31
|
TParams extends EmptyObject | void = void> (this: Creatable<T, TParams>, params: Partial<CreatableParams<TParams>>): CreatableFactory<T, TParams>
|
|
@@ -33,7 +38,7 @@ export interface Creatable<T extends EmptyObject | void = void, TParams extends
|
|
|
33
38
|
* @returns The decorated Module requiring it implement the members
|
|
34
39
|
* of the CreatableModule as statics properties/methods
|
|
35
40
|
*/
|
|
36
|
-
export function creatable<TInstance extends EmptyObject | void = void, TParams extends
|
|
41
|
+
export function creatable<TInstance extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams>() {
|
|
37
42
|
return <U extends Creatable<TInstance, TParams>>(constructor: U) => {
|
|
38
43
|
// eslint-disable-next-line @typescript-eslint/no-unused-expressions
|
|
39
44
|
constructor
|
|
@@ -3,11 +3,11 @@ import type { EmptyObject } from '@xylabs/object'
|
|
|
3
3
|
|
|
4
4
|
import type { CreatableName, CreatableParams } from './CreatableParams.ts'
|
|
5
5
|
|
|
6
|
-
export interface CreatableInstanceFields<TParams extends
|
|
6
|
+
export interface CreatableInstanceFields<TParams extends CreatableParams = CreatableParams, TEventData extends EventData = EventData> {
|
|
7
7
|
eventData: TEventData
|
|
8
8
|
name: CreatableName
|
|
9
9
|
params: CreatableParams<TParams>
|
|
10
10
|
}
|
|
11
11
|
|
|
12
|
-
export type CreatableInstance<T extends EmptyObject | void = void, TParams extends
|
|
13
|
-
= T extends
|
|
12
|
+
export type CreatableInstance<T extends EmptyObject | void = void, TParams extends CreatableParams = CreatableParams, TEventData extends EventData = EventData>
|
|
13
|
+
= T extends void ? CreatableInstanceFields<TParams, TEventData> : (T & CreatableInstanceFields<TParams, TEventData>)
|
|
@@ -6,10 +6,10 @@ import type { CreatableStatusReporter } from './CreatableStatusReporter.ts'
|
|
|
6
6
|
|
|
7
7
|
export type CreatableName = Exclude<string, 'creatable-name-reserved-32546239486'> & BaseClassName
|
|
8
8
|
|
|
9
|
-
export
|
|
9
|
+
export interface CreatableParamsFields {
|
|
10
10
|
name: CreatableName
|
|
11
11
|
statusReporter?: CreatableStatusReporter
|
|
12
12
|
}
|
|
13
13
|
|
|
14
|
-
export type CreatableParams<TAdditionalParams extends EmptyObject
|
|
15
|
-
= BaseEmitterParams<TAdditionalParams
|
|
14
|
+
export type CreatableParams<TAdditionalParams extends EmptyObject = EmptyObject>
|
|
15
|
+
= BaseEmitterParams<TAdditionalParams & CreatableParamsFields>
|