npm - @solidstarters/solid-core - Versions diffs - 1.2.206 → 1.2.207 - Mend

@solidstarters/solid-core 1.2.206 → 1.2.207

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 (69) hide show

package/dist/commands/seed.command.js CHANGED Viewed

@@ -44,7 +44,7 @@ let SeedCommand = SeedCommand_1 = class SeedCommand extends nest_commander_1.Com
             this.logger.error(`Seeder service ${options.seeder} not found. Does your service have a seed() method?`);
             return;
         }
-        this.logger.log(`Running the seed() method for seeder :${seeder.constructor.name}`);
+        this.logger.log(`Running the seed() method for seeder: ${seeder.constructor.name}`);
         await seeder.seed(parsedConf);
     }
     parseConf(val) {

package/dist/commands/seed.command.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"seed.command.js","sourceRoot":"","sources":["../../src/commands/seed.command.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAwC;AACxC,mDAAgE;AAChE,8DAA2D;AAQpD,IAAM,WAAW,mBAAjB,MAAM,WAAY,SAAQ,8BAAa;IAG5C,YAA6B,aAA4B;QACvD,KAAK,EAAE,CAAC;QADmB,kBAAa,GAAb,aAAa,CAAe;QAFxC,WAAM,GAAG,IAAI,eAAM,CAAC,aAAW,CAAC,IAAI,CAAC,CAAC;IAIvD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,WAAqB,EAAE,OAA4B;QAG3D,IAAI,UAAU,GAAQ,IAAI,CAAC;QAG3B,IAAI,OAAO,EAAE,IAAI,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC;gBACH,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACtC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;YACzE,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;gBACxE,OAAO;YACT,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gEAAgE,CAAC,CAAC;QACpF,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa;aAC9B,UAAU,EAAE;aACZ,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC;aAClD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;aAChC,GAAG,EAAE,CAAC;QACT,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,OAAO,CAAC,MAAM,qDAAqD,CAAC,CAAC;YACzG,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,yCAAyC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QACpF,MAAM,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;IAOD,SAAS,CAAC,GAAW;QACnB,OAAO,GAAG,CAAC;IACb,CAAC;IAGD,WAAW,CAAC,GAAW;QACrB,OAAO,GAAG,CAAC;IACb,CAAC;CACF,CAAA;AAnDY,kCAAW;AA2CtB;IADC,IAAA,uBAAM,EAAC,EAAE,KAAK,EAAE,iCAAiC,EAAE,WAAW,EAAE,iDAAiD,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;;;4CAGrI;AAGD;IADC,IAAA,uBAAM,EAAC,EAAE,KAAK,EAAE,4BAA4B,EAAE,WAAW,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,6BAA6B,EAAE,CAAC;;;;8CAG/I;sBAlDU,WAAW;IADvB,IAAA,wBAAO,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,sCAAsC,EAAE,CAAC;qCAIjC,8BAAa;GAH9C,WAAW,CAmDvB","sourcesContent":["import { Logger } from '@nestjs/common';\nimport { Command, CommandRunner, Option } from 'nest-commander';\nimport { SolidRegistry } from 'src/helpers/solid-registry';\n\ninterface SeedCommandOptions {\n conf?: string;\n seeder?: string;\n}\n\n@Command({ name: 'seed', description: 'Install seed data for a given module' })\nexport class SeedCommand extends CommandRunner {\n private readonly logger = new Logger(SeedCommand.name);\n\n constructor(private readonly solidRegistry: SolidRegistry) {\n super();\n }\n\n async run(passedParam: string[], options?: SeedCommandOptions): Promise<void> {\n // check if options.conf is non empty and a valid json string only is -c flag is passed.\n // convert to json object JSON.parse\n let parsedConf: any = null;\n\n // Parse conf only if provided\n if (options?.conf !== undefined) {\n try {\n parsedConf = JSON.parse(options.conf);\n this.logger.log(`Parsed conf: ${JSON.stringify(parsedConf, null, 2)}`);\n } catch (err) {\n this.logger.error('Failed to parse --conf. Please provide valid JSON.');\n return;\n }\n } else {\n this.logger.log('No --conf flag provided. Running with default seeder behavior.');\n }\n\n const seeder = this.solidRegistry\n .getSeeders()\n .filter((seeder) => seeder.name === options.seeder)\n .map((seeder) => seeder.instance)\n .pop();\n if (!seeder) {\n this.logger.error(`Seeder service ${options.seeder} not found. Does your service have a seed() method?`);\n return;\n }\n this.logger.log(`Running the seed() method for seeder :${seeder.constructor.name}`);\n await seeder.seed(parsedConf);\n }\n\n /*\n This parameter will be useful, to support seeders with the same name in different modules\n * Currently the seeder service won't support seeder with same classname within a module\n **/\n @Option({ flags: '-c, --conf [configuration json]', description: 'A configuration json, pass a valid json string.', required: false })\n parseConf(val: string): string {\n return val;\n }\n\n @Option({ flags: '-s, --seeder [seeder name]', description: 'The seeder to run.', required: true, defaultValue: 'ModuleMetadataSeederService' })\n parseString(val: string): string {\n return val;\n }\n}\n"]}
1	+ {"version":3,"file":"seed.command.js","sourceRoot":"","sources":["../../src/commands/seed.command.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAwC;AACxC,mDAAgE;AAChE,8DAA2D;AAQpD,IAAM,WAAW,mBAAjB,MAAM,WAAY,SAAQ,8BAAa;IAG5C,YAA6B,aAA4B;QACvD,KAAK,EAAE,CAAC;QADmB,kBAAa,GAAb,aAAa,CAAe;QAFxC,WAAM,GAAG,IAAI,eAAM,CAAC,aAAW,CAAC,IAAI,CAAC,CAAC;IAIvD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,WAAqB,EAAE,OAA4B;QAG3D,IAAI,UAAU,GAAQ,IAAI,CAAC;QAG3B,IAAI,OAAO,EAAE,IAAI,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC;gBACH,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACtC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;YACzE,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;gBACxE,OAAO;YACT,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gEAAgE,CAAC,CAAC;QACpF,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa;aAC9B,UAAU,EAAE;aACZ,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC;aAClD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;aAChC,GAAG,EAAE,CAAC;QACT,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,OAAO,CAAC,MAAM,qDAAqD,CAAC,CAAC;YACzG,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,yCAAyC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QACpF,MAAM,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;IAOD,SAAS,CAAC,GAAW;QACnB,OAAO,GAAG,CAAC;IACb,CAAC;IAGD,WAAW,CAAC,GAAW;QACrB,OAAO,GAAG,CAAC;IACb,CAAC;CACF,CAAA;AAnDY,kCAAW;AA2CtB;IADC,IAAA,uBAAM,EAAC,EAAE,KAAK,EAAE,iCAAiC,EAAE,WAAW,EAAE,iDAAiD,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;;;4CAGrI;AAGD;IADC,IAAA,uBAAM,EAAC,EAAE,KAAK,EAAE,4BAA4B,EAAE,WAAW,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,6BAA6B,EAAE,CAAC;;;;8CAG/I;sBAlDU,WAAW;IADvB,IAAA,wBAAO,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,sCAAsC,EAAE,CAAC;qCAIjC,8BAAa;GAH9C,WAAW,CAmDvB","sourcesContent":["import { Logger } from '@nestjs/common';\nimport { Command, CommandRunner, Option } from 'nest-commander';\nimport { SolidRegistry } from 'src/helpers/solid-registry';\n\ninterface SeedCommandOptions {\n conf?: string;\n seeder?: string;\n}\n\n@Command({ name: 'seed', description: 'Install seed data for a given module' })\nexport class SeedCommand extends CommandRunner {\n private readonly logger = new Logger(SeedCommand.name);\n\n constructor(private readonly solidRegistry: SolidRegistry) {\n super();\n }\n\n async run(passedParam: string[], options?: SeedCommandOptions): Promise<void> {\n // check if options.conf is non empty and a valid json string only is -c flag is passed.\n // convert to json object JSON.parse\n let parsedConf: any = null;\n\n // Parse conf only if provided\n if (options?.conf !== undefined) {\n try {\n parsedConf = JSON.parse(options.conf);\n this.logger.log(`Parsed conf: ${JSON.stringify(parsedConf, null, 2)}`);\n } catch (err) {\n this.logger.error('Failed to parse --conf. Please provide valid JSON.');\n return;\n }\n } else {\n this.logger.log('No --conf flag provided. Running with default seeder behavior.');\n }\n\n const seeder = this.solidRegistry\n .getSeeders()\n .filter((seeder) => seeder.name === options.seeder)\n .map((seeder) => seeder.instance)\n .pop();\n if (!seeder) {\n this.logger.error(`Seeder service ${options.seeder} not found. Does your service have a seed() method?`);\n return;\n }\n this.logger.log(`Running the seed() method for seeder: ${seeder.constructor.name}`);\n await seeder.seed(parsedConf);\n }\n\n /*\n This parameter will be useful, to support seeders with the same name in different modules\n * Currently the seeder service won't support seeder with same classname within a module\n **/\n @Option({ flags: '-c, --conf [configuration json]', description: 'A configuration json, pass a valid json string.', required: false })\n parseConf(val: string): string {\n return val;\n }\n\n @Option({ flags: '-s, --seeder [seeder name]', description: 'The seeder to run.', required: true, defaultValue: 'ModuleMetadataSeederService' })\n parseString(val: string): string {\n return val;\n }\n}\n"]}

package/dist/controllers/test.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"test.controller.d.ts","sourceRoot":"","sources":["../../src/controllers/test.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAEnF,qBAAa,QAAQ;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAEa,cAAc;IAGvB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IAHxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmC;gBAEvC,aAAa,EAAE,aAAa,EAC5B,qBAAqB,EAAE,qBAAqB;IAM/D,UAAU,CAAkB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAU,IAAI,EAAE,GAAG;;;;;IAOhF,UAAU,CAAiB,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAU,IAAI,EAAE,GAAG;;;IAWjE,SAAS,CAAiB,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAU,IAAI,EAAE,GAAG;;;~~CAsB7E~~"}
1	+ {"version":3,"file":"test.controller.d.ts","sourceRoot":"","sources":["../../src/controllers/test.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAEnF,qBAAa,QAAQ;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAEa,cAAc;IAGvB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IAHxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmC;gBAEvC,aAAa,EAAE,aAAa,EAC5B,qBAAqB,EAAE,qBAAqB;IAM/D,UAAU,CAAkB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAU,IAAI,EAAE,GAAG;;;;;IAOhF,UAAU,CAAiB,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAU,IAAI,EAAE,GAAG;;;IAWjE,SAAS,CAAiB,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAU,IAAI,EAAE,GAAG;;;CAI7E"}

package/dist/controllers/test.controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"test.controller.js","sourceRoot":"","sources":["../../src/controllers/test.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAA8G;AAC9G,+DAAgF;AAChF,6CAAyD;AACzD,8DAA2D;AAC3D,iEAAqD;AACrD,4DAAoD;AACpD,uFAAmF;AAEnF,MAAa,QAAQ;CAEpB;AAFD,4BAEC;AAIM,IAAM,cAAc,sBAApB,MAAM,cAAc;IAEzB,YACmB,aAA4B,EAC5B,qBAA4C;QAD5C,kBAAa,GAAb,aAAa,CAAe;QAC5B,0BAAqB,GAArB,qBAAqB,CAAuB;QAH9C,WAAM,GAAG,IAAI,eAAM,CAAC,gBAAc,CAAC,IAAI,CAAC,CAAC;IAItD,CAAC;IAKL,UAAU,CAAkB,KAAiC,EAAU,IAAS;QAC9E,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACjG,CAAC;IAKD,UAAU,CAAiB,IAAyB,EAAU,IAAS;QAErE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAExB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACxB,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC;IACzC,CAAC;IAKK,AAAN,KAAK,CAAC,SAAS,CAAiB,IAAyB,EAAU,IAAS;QAC1E,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,CAAC;QAC1C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACtB,CAAC;~~CAmBF~~,CAAA;~~AAlDY~~,wCAAc;AAUzB;IAHC,IAAA,qBAAI,EAAC,yBAAQ,CAAC,IAAI,CAAC;IACnB,IAAA,wBAAe,EAAC,IAAA,sCAAmB,GAAE,CAAC;IACtC,IAAA,aAAI,EAAC,SAAS,CAAC;;IACJ,WAAA,IAAA,sBAAa,GAAE,CAAA;IAAqC,WAAA,IAAA,aAAI,GAAE,CAAA;;qCAAnC,KAAK;;gDAEvC;AAKD;IAHC,IAAA,qBAAI,EAAC,yBAAQ,CAAC,IAAI,CAAC;IACnB,IAAA,aAAI,EAAC,QAAQ,CAAC;IACd,IAAA,wBAAe,EAAC,IAAA,kCAAe,EAAC,MAAM,CAAC,CAAC;;IAC7B,WAAA,IAAA,qBAAY,GAAE,CAAA;IAA6B,WAAA,IAAA,aAAI,GAAE,CAAA;;;;gDAM5D;AAKK;IAHL,IAAA,uBAAa,EAAC,KAAK,CAAC;IACpB,IAAA,aAAI,EAAC,YAAY,CAAC;IAClB,IAAA,wBAAe,EAAC,IAAA,kCAAe,EAAC,MAAM,CAAC,CAAC;;IACxB,WAAA,IAAA,qBAAY,GAAE,CAAA;IAA6B,WAAA,IAAA,aAAI,GAAE,CAAA;;;;+CAGjE;yBA/BU,cAAc;IAF1B,IAAA,mBAAU,EAAC,MAAM,CAAC;IAClB,IAAA,iBAAO,EAAC,YAAY,CAAC;qCAIc,8BAAa;QACL,+CAAqB;GAJpD,cAAc,~~CAkD1B~~","sourcesContent":["import { Body, Controller, Logger, Post, UploadedFile, UploadedFiles, UseInterceptors } from \"@nestjs/common\";\nimport { AnyFilesInterceptor, FileInterceptor } from \"@nestjs/platform-express\";\nimport { ApiBearerAuth, ApiTags } from \"@nestjs/swagger\";\nimport { SolidRegistry } from \"src/helpers/solid-registry\";\nimport { Auth } from \"src/decorators/auth.decorator\";\nimport { AuthType } from \"src/enums/auth-type.enum\";\nimport { IngestMetadataService } from \"src/services/genai/ingest-metadata.service\";\n\nexport class SeedData {\n seeder: string;\n}\n\n@Controller('test')\n@ApiTags(\"Solid Core\")\nexport class TestController {\n private readonly logger = new Logger(TestController.name);\n constructor(\n private readonly solidRegistry: SolidRegistry,\n private readonly ingestMetadataService: IngestMetadataService,\n ) { }\n\n @Auth(AuthType.None)\n @UseInterceptors(AnyFilesInterceptor())\n @Post('uploads')\n uploadData(@UploadedFiles() files: Array<Express.Multer.File>, @Body() body: any) {\n return { message: 'file uploaded', fileNames: files.map(f => f.originalname), formData: body };\n }\n\n @Auth(AuthType.None)\n @Post('upload')\n @UseInterceptors(FileInterceptor('file')) // 'file' here is the name of the field in the form\n uploadFile(@UploadedFile() file: Express.Multer.File, @Body() body: any) {\n // console.log(file);\n this.logger.debug(file);\n // console.log(body);\n this.logger.debug(body);\n return { filename: file.originalname };\n }\n\n @ApiBearerAuth(\"jwt\")\n @Post('mcp/ingest')\n @UseInterceptors(FileInterceptor('file'))\n async mcpIngest(@UploadedFile() file: Express.Multer.File, @Body() body: any) {\n await this.ingestMetadataService.ingest();\n return { ok: true };\n }\n\n // @Public()\n // @Post('seed')\n // async seedData(@Body() seedData: any) {\n // const seeder = this.solidRegistry\n // .getSeeders()\n // .filter((seeder) => seeder.name === seedData.seeder)\n // .map((seeder) => seeder.instance)\n // .pop();\n // if (!seeder) {\n // this.logger.error(`Seeder service ${seedData.seeder} ~~not found. Does your service have a seed() method?`);\n // return;\n // }~~\n ~~// this.logger.log(`Running the seed() method for seeder :${seeder.constructor.name}`);\n // await seeder.seed();\n // return { message: `seed data for ${seedData.seeder}` };\n // }\n\n}\n~~"]}
1	+ {"version":3,"file":"test.controller.js","sourceRoot":"","sources":["../../src/controllers/test.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAA8G;AAC9G,+DAAgF;AAChF,6CAAyD;AACzD,8DAA2D;AAC3D,iEAAqD;AACrD,4DAAoD;AACpD,uFAAmF;AAEnF,MAAa,QAAQ;CAEpB;AAFD,4BAEC;AAIM,IAAM,cAAc,sBAApB,MAAM,cAAc;IAEzB,YACmB,aAA4B,EAC5B,qBAA4C;QAD5C,kBAAa,GAAb,aAAa,CAAe;QAC5B,0BAAqB,GAArB,qBAAqB,CAAuB;QAH9C,WAAM,GAAG,IAAI,eAAM,CAAC,gBAAc,CAAC,IAAI,CAAC,CAAC;IAItD,CAAC;IAKL,UAAU,CAAkB,KAAiC,EAAU,IAAS;QAC9E,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACjG,CAAC;IAKD,UAAU,CAAiB,IAAyB,EAAU,IAAS;QAErE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAExB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACxB,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC;IACzC,CAAC;IAKK,AAAN,KAAK,CAAC,SAAS,CAAiB,IAAyB,EAAU,IAAS;QAC1E,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,CAAC;QAC1C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACtB,CAAC;CACF,CAAA;AAhCY,wCAAc;AAUzB;IAHC,IAAA,qBAAI,EAAC,yBAAQ,CAAC,IAAI,CAAC;IACnB,IAAA,wBAAe,EAAC,IAAA,sCAAmB,GAAE,CAAC;IACtC,IAAA,aAAI,EAAC,SAAS,CAAC;;IACJ,WAAA,IAAA,sBAAa,GAAE,CAAA;IAAqC,WAAA,IAAA,aAAI,GAAE,CAAA;;qCAAnC,KAAK;;gDAEvC;AAKD;IAHC,IAAA,qBAAI,EAAC,yBAAQ,CAAC,IAAI,CAAC;IACnB,IAAA,aAAI,EAAC,QAAQ,CAAC;IACd,IAAA,wBAAe,EAAC,IAAA,kCAAe,EAAC,MAAM,CAAC,CAAC;;IAC7B,WAAA,IAAA,qBAAY,GAAE,CAAA;IAA6B,WAAA,IAAA,aAAI,GAAE,CAAA;;;;gDAM5D;AAKK;IAHL,IAAA,uBAAa,EAAC,KAAK,CAAC;IACpB,IAAA,aAAI,EAAC,YAAY,CAAC;IAClB,IAAA,wBAAe,EAAC,IAAA,kCAAe,EAAC,MAAM,CAAC,CAAC;;IACxB,WAAA,IAAA,qBAAY,GAAE,CAAA;IAA6B,WAAA,IAAA,aAAI,GAAE,CAAA;;;;+CAGjE;yBA/BU,cAAc;IAF1B,IAAA,mBAAU,EAAC,MAAM,CAAC;IAClB,IAAA,iBAAO,EAAC,YAAY,CAAC;qCAIc,8BAAa;QACL,+CAAqB;GAJpD,cAAc,CAgC1B","sourcesContent":["import { Body, Controller, Logger, Post, UploadedFile, UploadedFiles, UseInterceptors } from \"@nestjs/common\";\nimport { AnyFilesInterceptor, FileInterceptor } from \"@nestjs/platform-express\";\nimport { ApiBearerAuth, ApiTags } from \"@nestjs/swagger\";\nimport { SolidRegistry } from \"src/helpers/solid-registry\";\nimport { Auth } from \"src/decorators/auth.decorator\";\nimport { AuthType } from \"src/enums/auth-type.enum\";\nimport { IngestMetadataService } from \"src/services/genai/ingest-metadata.service\";\n\nexport class SeedData {\n seeder: string;\n}\n\n@Controller('test')\n@ApiTags(\"Solid Core\")\nexport class TestController {\n private readonly logger = new Logger(TestController.name);\n constructor(\n private readonly solidRegistry: SolidRegistry,\n private readonly ingestMetadataService: IngestMetadataService,\n ) { }\n\n @Auth(AuthType.None)\n @UseInterceptors(AnyFilesInterceptor())\n @Post('uploads')\n uploadData(@UploadedFiles() files: Array<Express.Multer.File>, @Body() body: any) {\n return { message: 'file uploaded', fileNames: files.map(f => f.originalname), formData: body };\n }\n\n @Auth(AuthType.None)\n @Post('upload')\n @UseInterceptors(FileInterceptor('file')) // 'file' here is the name of the field in the form\n uploadFile(@UploadedFile() file: Express.Multer.File, @Body() body: any) {\n // console.log(file);\n this.logger.debug(file);\n // console.log(body);\n this.logger.debug(body);\n return { filename: file.originalname };\n }\n\n @ApiBearerAuth(\"jwt\")\n @Post('mcp/ingest')\n @UseInterceptors(FileInterceptor('file'))\n async mcpIngest(@UploadedFile() file: Express.Multer.File, @Body() body: any) {\n await this.ingestMetadataService.ingest();\n return { ok: true };\n }\n}\n"]}

package/dist/dtos/create-scheduled-job.dto.d.ts CHANGED Viewed

@@ -11,6 +11,7 @@ export declare class CreateScheduledJobDto {
     nextRunAt: Date;
     dayOfWeek: string;
     job: string;
+    cronExpression: string;
     moduleId: number;
     moduleUserKey: string;
 }

package/dist/dtos/create-scheduled-job.dto.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"create-scheduled-job.dto.d.ts","sourceRoot":"","sources":["../../src/dtos/create-scheduled-job.dto.ts"],"names":[],"mappings":"AAIA,qBAAa,qBAAqB;IAI9B,YAAY,EAAE,MAAM,CAAC;IAIrB,QAAQ,EAAE,OAAO,CAAS;IAI1B,SAAS,EAAE,MAAM,CAAC;IAIlB,SAAS,EAAE,IAAI,CAAC;IAIhB,OAAO,EAAE,IAAI,CAAC;IAId,SAAS,EAAE,IAAI,CAAC;IAIhB,OAAO,EAAE,IAAI,CAAC;IAId,UAAU,EAAE,MAAM,CAAC;IAInB,SAAS,EAAE,IAAI,CAAC;IAIhB,SAAS,EAAE,IAAI,CAAC;IAIhB,SAAS,EAAE,MAAM,CAAC;IAIlB,GAAG,EAAE,MAAM,CAAC;IAIZ,QAAQ,EAAE,MAAM,CAAC;IAIjB,aAAa,EAAE,MAAM,CAAC;CACzB"}
1	+ {"version":3,"file":"create-scheduled-job.dto.d.ts","sourceRoot":"","sources":["../../src/dtos/create-scheduled-job.dto.ts"],"names":[],"mappings":"AAIA,qBAAa,qBAAqB;IAI9B,YAAY,EAAE,MAAM,CAAC;IAIrB,QAAQ,EAAE,OAAO,CAAS;IAI1B,SAAS,EAAE,MAAM,CAAC;IAIlB,SAAS,EAAE,IAAI,CAAC;IAIhB,OAAO,EAAE,IAAI,CAAC;IAId,SAAS,EAAE,IAAI,CAAC;IAIhB,OAAO,EAAE,IAAI,CAAC;IAId,UAAU,EAAE,MAAM,CAAC;IAInB,SAAS,EAAE,IAAI,CAAC;IAIhB,SAAS,EAAE,IAAI,CAAC;IAIhB,SAAS,EAAE,MAAM,CAAC;IAIlB,GAAG,EAAE,MAAM,CAAC;IAIZ,cAAc,EAAE,MAAM,CAAC;IAIvB,QAAQ,EAAE,MAAM,CAAC;IAIjB,aAAa,EAAE,MAAM,CAAC;CACzB"}

package/dist/dtos/create-scheduled-job.dto.js CHANGED Viewed

@@ -19,7 +19,7 @@ class CreateScheduledJobDto {
         this.isActive = false;
     }
     static _OPENAPI_METADATA_FACTORY() {
-        return { scheduleName: { required: true, type: () => String }, isActive: { required: true, type: () => Boolean, default: false }, frequency: { required: true, type: () => String }, startTime: { required: true, type: () => Date }, endTime: { required: true, type: () => Date }, startDate: { required: true, type: () => Date }, endDate: { required: true, type: () => Date }, dayOfMonth: { required: true, type: () => Number }, lastRunAt: { required: true, type: () => Date }, nextRunAt: { required: true, type: () => Date }, dayOfWeek: { required: true, type: () => String }, job: { required: true, type: () => String }, moduleId: { required: true, type: () => Number }, moduleUserKey: { required: true, type: () => String } };
+        return { scheduleName: { required: true, type: () => String }, isActive: { required: true, type: () => Boolean, default: false }, frequency: { required: true, type: () => String }, startTime: { required: true, type: () => Date }, endTime: { required: true, type: () => Date }, startDate: { required: true, type: () => Date }, endDate: { required: true, type: () => Date }, dayOfMonth: { required: true, type: () => Number }, lastRunAt: { required: true, type: () => Date }, nextRunAt: { required: true, type: () => Date }, dayOfWeek: { required: true, type: () => String }, job: { required: true, type: () => String }, cronExpression: { required: true, type: () => String }, moduleId: { required: true, type: () => Number }, moduleUserKey: { required: true, type: () => String } };
     }
 }
 exports.CreateScheduledJobDto = CreateScheduledJobDto;
@@ -95,6 +95,12 @@ __decorate([
     (0, swagger_1.ApiProperty)(),
     __metadata("design:type", String)
 ], CreateScheduledJobDto.prototype, "job", void 0);
+__decorate([
+    (0, class_validator_2.IsOptional)(),
+    (0, class_validator_1.IsString)(),
+    (0, swagger_1.ApiProperty)(),
+    __metadata("design:type", String)
+], CreateScheduledJobDto.prototype, "cronExpression", void 0);
 __decorate([
     (0, class_validator_2.IsOptional)(),
     (0, class_validator_2.IsInt)(),

package/dist/dtos/create-scheduled-job.dto.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"create-scheduled-job.dto.js","sourceRoot":"","sources":["../../src/dtos/create-scheduled-job.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,6CAA8C;AAC9C,qDAA2C;AAC3C,qDAAmF;AAEnF,MAAa,qBAAqB;IAAlC;QAQI,aAAQ,GAAY,KAAK,CAAC;~~KAiD7B~~;;~~iIAjDuB~~,KAAK;;~~CAiD5B~~;~~AAzDD~~,~~sDAyDC~~;~~AArDG~~;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;2DACO;AAIrB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,2BAAS,GAAE;IACX,IAAA,qBAAW,GAAE;;uDACY;AAI1B;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;wDACI;AAIlB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACH,IAAI;wDAAC;AAIhB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACL,IAAI;sDAAC;AAId;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACH,IAAI;wDAAC;AAIhB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACL,IAAI;sDAAC;AAId;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,uBAAK,GAAE;IACP,IAAA,qBAAW,GAAE;;yDACK;AAInB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACH,IAAI;wDAAC;AAIhB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACH,IAAI;wDAAC;AAIhB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;wDACI;AAIlB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;kDACF;AAIZ;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,uBAAK,GAAE;IACP,IAAA,qBAAW,GAAE;;uDACG;AAIjB;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,qBAAW,GAAE;;4DACQ","sourcesContent":["import { ApiProperty } from '@nestjs/swagger';\nimport { IsString } from 'class-validator';\nimport { IsNotEmpty, IsBoolean, IsDate, IsOptional, IsInt } from 'class-validator';\n\nexport class CreateScheduledJobDto {\n @IsNotEmpty()\n @IsString()\n @ApiProperty()\n scheduleName: string;\n @IsNotEmpty()\n @IsBoolean()\n @ApiProperty()\n isActive: boolean = false;\n @IsNotEmpty()\n @IsString()\n @ApiProperty()\n frequency: string;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n startTime: Date;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n endTime: Date;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n startDate: Date;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n endDate: Date;\n @IsOptional()\n @IsInt()\n @ApiProperty()\n dayOfMonth: number;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n lastRunAt: Date;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n nextRunAt: Date;\n @IsOptional()\n @IsString()\n @ApiProperty()\n dayOfWeek: string;\n @IsNotEmpty()\n @IsString()\n @ApiProperty()\n job: string;\n @IsOptional()\n @IsInt()\n @ApiProperty()\n moduleId: number;\n @IsString()\n @IsOptional()\n @ApiProperty()\n moduleUserKey: string;\n}"]}
1	+ {"version":3,"file":"create-scheduled-job.dto.js","sourceRoot":"","sources":["../../src/dtos/create-scheduled-job.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,6CAA8C;AAC9C,qDAA2C;AAC3C,qDAAmF;AAEnF,MAAa,qBAAqB;IAAlC;QAQI,aAAQ,GAAY,KAAK,CAAC;KAqD7B;;iIArDuB,KAAK;;CAqD5B;AA7DD,sDA6DC;AAzDG;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;2DACO;AAIrB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,2BAAS,GAAE;IACX,IAAA,qBAAW,GAAE;;uDACY;AAI1B;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;wDACI;AAIlB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACH,IAAI;wDAAC;AAIhB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACL,IAAI;sDAAC;AAId;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACH,IAAI;wDAAC;AAIhB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACL,IAAI;sDAAC;AAId;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,uBAAK,GAAE;IACP,IAAA,qBAAW,GAAE;;yDACK;AAInB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACH,IAAI;wDAAC;AAIhB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACH,IAAI;wDAAC;AAIhB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;wDACI;AAIlB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;kDACF;AAIZ;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;6DACS;AAIvB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,uBAAK,GAAE;IACP,IAAA,qBAAW,GAAE;;uDACG;AAIjB;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,qBAAW,GAAE;;4DACQ","sourcesContent":["import { ApiProperty } from '@nestjs/swagger';\nimport { IsString } from 'class-validator';\nimport { IsNotEmpty, IsBoolean, IsDate, IsOptional, IsInt } from 'class-validator';\n\nexport class CreateScheduledJobDto {\n @IsNotEmpty()\n @IsString()\n @ApiProperty()\n scheduleName: string;\n @IsNotEmpty()\n @IsBoolean()\n @ApiProperty()\n isActive: boolean = false;\n @IsNotEmpty()\n @IsString()\n @ApiProperty()\n frequency: string;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n startTime: Date;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n endTime: Date;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n startDate: Date;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n endDate: Date;\n @IsOptional()\n @IsInt()\n @ApiProperty()\n dayOfMonth: number;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n lastRunAt: Date;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n nextRunAt: Date;\n @IsOptional()\n @IsString()\n @ApiProperty()\n dayOfWeek: string;\n @IsNotEmpty()\n @IsString()\n @ApiProperty()\n job: string;\n @IsOptional()\n @IsString()\n @ApiProperty()\n cronExpression: string;\n @IsOptional()\n @IsInt()\n @ApiProperty()\n moduleId: number;\n @IsString()\n @IsOptional()\n @ApiProperty()\n moduleUserKey: string;\n}"]}

package/dist/dtos/update-scheduled-job.dto.d.ts CHANGED Viewed

@@ -12,6 +12,7 @@ export declare class UpdateScheduledJobDto {
     nextRunAt: Date;
     dayOfWeek: string;
     job: string;
+    cronExpression: string;
     moduleId: number;
     moduleUserKey: string;
 }

package/dist/dtos/update-scheduled-job.dto.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update-scheduled-job.dto.d.ts","sourceRoot":"","sources":["../../src/dtos/update-scheduled-job.dto.ts"],"names":[],"mappings":"AAGA,qBAAa,qBAAqB;IAG9B,EAAE,EAAE,MAAM,CAAC;IAKX,YAAY,EAAE,MAAM,CAAC;IAKrB,QAAQ,EAAE,OAAO,CAAC;IAKlB,SAAS,EAAE,MAAM,CAAC;IAIlB,SAAS,EAAE,IAAI,CAAC;IAIhB,OAAO,EAAE,IAAI,CAAC;IAId,SAAS,EAAE,IAAI,CAAC;IAIhB,OAAO,EAAE,IAAI,CAAC;IAId,UAAU,EAAE,MAAM,CAAC;IAInB,SAAS,EAAE,IAAI,CAAC;IAIhB,SAAS,EAAE,IAAI,CAAC;IAIhB,SAAS,EAAE,MAAM,CAAC;IAKlB,GAAG,EAAE,MAAM,CAAC;IAIZ,QAAQ,EAAE,MAAM,CAAC;IAIjB,aAAa,EAAE,MAAM,CAAC;CACzB"}
1	+ {"version":3,"file":"update-scheduled-job.dto.d.ts","sourceRoot":"","sources":["../../src/dtos/update-scheduled-job.dto.ts"],"names":[],"mappings":"AAGA,qBAAa,qBAAqB;IAG9B,EAAE,EAAE,MAAM,CAAC;IAKX,YAAY,EAAE,MAAM,CAAC;IAKrB,QAAQ,EAAE,OAAO,CAAC;IAKlB,SAAS,EAAE,MAAM,CAAC;IAIlB,SAAS,EAAE,IAAI,CAAC;IAIhB,OAAO,EAAE,IAAI,CAAC;IAId,SAAS,EAAE,IAAI,CAAC;IAIhB,OAAO,EAAE,IAAI,CAAC;IAId,UAAU,EAAE,MAAM,CAAC;IAInB,SAAS,EAAE,IAAI,CAAC;IAIhB,SAAS,EAAE,IAAI,CAAC;IAIhB,SAAS,EAAE,MAAM,CAAC;IAKlB,GAAG,EAAE,MAAM,CAAC;IAIZ,cAAc,EAAE,MAAM,CAAC;IAIvB,QAAQ,EAAE,MAAM,CAAC;IAIjB,aAAa,EAAE,MAAM,CAAC;CACzB"}

package/dist/dtos/update-scheduled-job.dto.js CHANGED Viewed

@@ -15,7 +15,7 @@ const class_validator_1 = require("class-validator");
 const swagger_1 = require("@nestjs/swagger");
 class UpdateScheduledJobDto {
     static _OPENAPI_METADATA_FACTORY() {
-        return { id: { required: true, type: () => Number }, scheduleName: { required: true, type: () => String }, isActive: { required: true, type: () => Boolean }, frequency: { required: true, type: () => String }, startTime: { required: true, type: () => Date }, endTime: { required: true, type: () => Date }, startDate: { required: true, type: () => Date }, endDate: { required: true, type: () => Date }, dayOfMonth: { required: true, type: () => Number }, lastRunAt: { required: true, type: () => Date }, nextRunAt: { required: true, type: () => Date }, dayOfWeek: { required: true, type: () => String }, job: { required: true, type: () => String }, moduleId: { required: true, type: () => Number }, moduleUserKey: { required: true, type: () => String } };
+        return { id: { required: true, type: () => Number }, scheduleName: { required: true, type: () => String }, isActive: { required: true, type: () => Boolean }, frequency: { required: true, type: () => String }, startTime: { required: true, type: () => Date }, endTime: { required: true, type: () => Date }, startDate: { required: true, type: () => Date }, endDate: { required: true, type: () => Date }, dayOfMonth: { required: true, type: () => Number }, lastRunAt: { required: true, type: () => Date }, nextRunAt: { required: true, type: () => Date }, dayOfWeek: { required: true, type: () => String }, job: { required: true, type: () => String }, cronExpression: { required: true, type: () => String }, moduleId: { required: true, type: () => Number }, moduleUserKey: { required: true, type: () => String } };
     }
 }
 exports.UpdateScheduledJobDto = UpdateScheduledJobDto;
@@ -100,6 +100,12 @@ __decorate([
     (0, swagger_1.ApiProperty)(),
     __metadata("design:type", String)
 ], UpdateScheduledJobDto.prototype, "job", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsString)(),
+    (0, swagger_1.ApiProperty)(),
+    __metadata("design:type", String)
+], UpdateScheduledJobDto.prototype, "cronExpression", void 0);
 __decorate([
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsInt)(),

package/dist/dtos/update-scheduled-job.dto.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update-scheduled-job.dto.js","sourceRoot":"","sources":["../../src/dtos/update-scheduled-job.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qDAA6F;AAC7F,6CAA8C;AAE9C,MAAa,qBAAqB;;;;~~CAgEjC~~;~~AAhED~~,~~sDAgEC~~;~~AA7DG~~;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,uBAAK,GAAE;;iDACG;AAKX;IAJC,IAAA,4BAAU,GAAE;IACZ,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;2DACO;AAKrB;IAJC,IAAA,4BAAU,GAAE;IACZ,IAAA,4BAAU,GAAE;IACZ,IAAA,2BAAS,GAAE;IACX,IAAA,qBAAW,GAAE;;uDACI;AAKlB;IAJC,IAAA,4BAAU,GAAE;IACZ,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;wDACI;AAIlB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACH,IAAI;wDAAC;AAIhB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACL,IAAI;sDAAC;AAId;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACH,IAAI;wDAAC;AAIhB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACL,IAAI;sDAAC;AAId;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,uBAAK,GAAE;IACP,IAAA,qBAAW,GAAE;;yDACK;AAInB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACH,IAAI;wDAAC;AAIhB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACH,IAAI;wDAAC;AAIhB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;wDACI;AAKlB;IAJC,IAAA,4BAAU,GAAE;IACZ,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;kDACF;AAIZ;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,uBAAK,GAAE;IACP,IAAA,qBAAW,GAAE;;uDACG;AAIjB;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,qBAAW,GAAE;;4DACQ","sourcesContent":["import { IsInt, IsOptional, IsString, IsNotEmpty, IsBoolean, IsDate } from 'class-validator';\nimport { ApiProperty } from '@nestjs/swagger';\n\nexport class UpdateScheduledJobDto {\n @IsOptional()\n @IsInt()\n id: number;\n @IsNotEmpty()\n @IsOptional()\n @IsString()\n @ApiProperty()\n scheduleName: string;\n @IsNotEmpty()\n @IsOptional()\n @IsBoolean()\n @ApiProperty()\n isActive: boolean;\n @IsNotEmpty()\n @IsOptional()\n @IsString()\n @ApiProperty()\n frequency: string;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n startTime: Date;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n endTime: Date;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n startDate: Date;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n endDate: Date;\n @IsOptional()\n @IsInt()\n @ApiProperty()\n dayOfMonth: number;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n lastRunAt: Date;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n nextRunAt: Date;\n @IsOptional()\n @IsString()\n @ApiProperty()\n dayOfWeek: string;\n @IsNotEmpty()\n @IsOptional()\n @IsString()\n @ApiProperty()\n job: string;\n @IsOptional()\n @IsInt()\n @ApiProperty()\n moduleId: number;\n @IsString()\n @IsOptional()\n @ApiProperty()\n moduleUserKey: string;\n}"]}
1	+ {"version":3,"file":"update-scheduled-job.dto.js","sourceRoot":"","sources":["../../src/dtos/update-scheduled-job.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qDAA6F;AAC7F,6CAA8C;AAE9C,MAAa,qBAAqB;;;;CAoEjC;AApED,sDAoEC;AAjEG;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,uBAAK,GAAE;;iDACG;AAKX;IAJC,IAAA,4BAAU,GAAE;IACZ,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;2DACO;AAKrB;IAJC,IAAA,4BAAU,GAAE;IACZ,IAAA,4BAAU,GAAE;IACZ,IAAA,2BAAS,GAAE;IACX,IAAA,qBAAW,GAAE;;uDACI;AAKlB;IAJC,IAAA,4BAAU,GAAE;IACZ,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;wDACI;AAIlB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACH,IAAI;wDAAC;AAIhB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACL,IAAI;sDAAC;AAId;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACH,IAAI;wDAAC;AAIhB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACL,IAAI;sDAAC;AAId;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,uBAAK,GAAE;IACP,IAAA,qBAAW,GAAE;;yDACK;AAInB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACH,IAAI;wDAAC;AAIhB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;8BACH,IAAI;wDAAC;AAIhB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;wDACI;AAKlB;IAJC,IAAA,4BAAU,GAAE;IACZ,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;kDACF;AAIZ;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAW,GAAE;;6DACS;AAIvB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,uBAAK,GAAE;IACP,IAAA,qBAAW,GAAE;;uDACG;AAIjB;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,qBAAW,GAAE;;4DACQ","sourcesContent":["import { IsInt, IsOptional, IsString, IsNotEmpty, IsBoolean, IsDate } from 'class-validator';\nimport { ApiProperty } from '@nestjs/swagger';\n\nexport class UpdateScheduledJobDto {\n @IsOptional()\n @IsInt()\n id: number;\n @IsNotEmpty()\n @IsOptional()\n @IsString()\n @ApiProperty()\n scheduleName: string;\n @IsNotEmpty()\n @IsOptional()\n @IsBoolean()\n @ApiProperty()\n isActive: boolean;\n @IsNotEmpty()\n @IsOptional()\n @IsString()\n @ApiProperty()\n frequency: string;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n startTime: Date;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n endTime: Date;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n startDate: Date;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n endDate: Date;\n @IsOptional()\n @IsInt()\n @ApiProperty()\n dayOfMonth: number;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n lastRunAt: Date;\n @IsOptional()\n @IsDate()\n @ApiProperty()\n nextRunAt: Date;\n @IsOptional()\n @IsString()\n @ApiProperty()\n dayOfWeek: string;\n @IsNotEmpty()\n @IsOptional()\n @IsString()\n @ApiProperty()\n job: string;\n @IsOptional()\n @IsString()\n @ApiProperty()\n cronExpression: string;\n @IsOptional()\n @IsInt()\n @ApiProperty()\n moduleId: number;\n @IsString()\n @IsOptional()\n @ApiProperty()\n moduleUserKey: string;\n}"]}

package/dist/entities/scheduled-job.entity.d.ts CHANGED Viewed

@@ -13,6 +13,7 @@ export declare class ScheduledJob extends CommonEntity {
     nextRunAt: Date;
     dayOfWeek: string;
     job: string;
+    cronExpression: string;
     module: ModuleMetadata;
 }
 //# sourceMappingURL=scheduled-job.entity.d.ts.map

package/dist/entities/scheduled-job.entity.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"scheduled-job.entity.d.ts","sourceRoot":"","sources":["../../src/entities/scheduled-job.entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAErE,qBACa,YAAa,SAAQ,YAAY;IAG1C,YAAY,EAAE,MAAM,CAAC;IAErB,QAAQ,EAAE,OAAO,CAAS;IAE1B,SAAS,EAAE,MAAM,CAAC;IAElB,SAAS,EAAE,IAAI,CAAC;IAEhB,OAAO,EAAE,IAAI,CAAC;IAEd,SAAS,EAAE,IAAI,CAAC;IAEhB,OAAO,EAAE,IAAI,CAAC;IAEd,UAAU,EAAE,MAAM,CAAC;IAEnB,SAAS,EAAE,IAAI,CAAC;IAEhB,SAAS,EAAE,IAAI,CAAC;IAEhB,SAAS,EAAE,MAAM,CAAC;IAElB,GAAG,EAAE,MAAM,CAAC;~~IAIZ~~,MAAM,EAAE,cAAc,CAAC;CAC1B"}
1	+ {"version":3,"file":"scheduled-job.entity.d.ts","sourceRoot":"","sources":["../../src/entities/scheduled-job.entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAErE,qBACa,YAAa,SAAQ,YAAY;IAG1C,YAAY,EAAE,MAAM,CAAC;IAErB,QAAQ,EAAE,OAAO,CAAS;IAE1B,SAAS,EAAE,MAAM,CAAC;IAElB,SAAS,EAAE,IAAI,CAAC;IAEhB,OAAO,EAAE,IAAI,CAAC;IAEd,SAAS,EAAE,IAAI,CAAC;IAEhB,OAAO,EAAE,IAAI,CAAC;IAEd,UAAU,EAAE,MAAM,CAAC;IAEnB,SAAS,EAAE,IAAI,CAAC;IAEhB,SAAS,EAAE,IAAI,CAAC;IAEhB,SAAS,EAAE,MAAM,CAAC;IAElB,GAAG,EAAE,MAAM,CAAC;IAEZ,cAAc,EAAE,MAAM,CAAC;IAIvB,MAAM,EAAE,cAAc,CAAC;CAC1B"}

package/dist/entities/scheduled-job.entity.js CHANGED Viewed

@@ -20,7 +20,7 @@ let ScheduledJob = class ScheduledJob extends common_entity_1.CommonEntity {
         this.isActive = false;
     }
     static _OPENAPI_METADATA_FACTORY() {
-        return { scheduleName: { required: true, type: () => String }, isActive: { required: true, type: () => Boolean, default: false }, frequency: { required: true, type: () => String }, startTime: { required: true, type: () => Date }, endTime: { required: true, type: () => Date }, startDate: { required: true, type: () => Date }, endDate: { required: true, type: () => Date }, dayOfMonth: { required: true, type: () => Number }, lastRunAt: { required: true, type: () => Date }, nextRunAt: { required: true, type: () => Date }, dayOfWeek: { required: true, type: () => String }, job: { required: true, type: () => String }, module: { required: true, type: () => require("./module-metadata.entity").ModuleMetadata } };
+        return { scheduleName: { required: true, type: () => String }, isActive: { required: true, type: () => Boolean, default: false }, frequency: { required: true, type: () => String }, startTime: { required: true, type: () => Date }, endTime: { required: true, type: () => Date }, startDate: { required: true, type: () => Date }, endDate: { required: true, type: () => Date }, dayOfMonth: { required: true, type: () => Number }, lastRunAt: { required: true, type: () => Date }, nextRunAt: { required: true, type: () => Date }, dayOfWeek: { required: true, type: () => String }, job: { required: true, type: () => String }, cronExpression: { required: true, type: () => String }, module: { required: true, type: () => require("./module-metadata.entity").ModuleMetadata } };
     }
 };
 exports.ScheduledJob = ScheduledJob;
@@ -73,6 +73,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: "varchar" }),
     __metadata("design:type", String)
 ], ScheduledJob.prototype, "job", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: "varchar", nullable: true }),
+    __metadata("design:type", String)
+], ScheduledJob.prototype, "cronExpression", void 0);
 __decorate([
     (0, typeorm_1.Index)(),
     (0, typeorm_1.ManyToOne)(() => module_metadata_entity_1.ModuleMetadata, { nullable: false }),

package/dist/entities/scheduled-job.entity.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"scheduled-job.entity.js","sourceRoot":"","sources":["../../src/entities/scheduled-job.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCAAuE;AACvE,mDAA+C;AAC/C,qEAAqE;AAG9D,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,4BAAY;IAAvC;;QAKH,aAAQ,GAAY,KAAK,CAAC;~~KAyB7B~~;;~~iIAzBuB~~,KAAK;;~~CAyB5B~~,CAAA;~~AA9BY~~,oCAAY;AAGrB;IAFC,IAAA,eAAK,EAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACvB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;kDACP;AAErB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;8CACD;AAE1B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;+CACV;AAElB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC9B,IAAI;+CAAC;AAEhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAChC,IAAI;6CAAC;AAEd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC9B,IAAI;+CAAC;AAEhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAChC,IAAI;6CAAC;AAEd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACzB;AAEnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAChB,IAAI;+CAAC;AAEhB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAChB,IAAI;+CAAC;AAEhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAC1B;AAElB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;yCAChB;~~AAIZ~~;IAHC,IAAA,eAAK,GAAE;IACP,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,uCAAc,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IACpD,IAAA,oBAAU,EAAC,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC;8BACnC,uCAAc;4CAAC;~~uBA7Bd~~,YAAY;IADxB,IAAA,gBAAM,EAAC,kBAAkB,CAAC;GACd,YAAY,~~CA8BxB~~","sourcesContent":["import { Entity, Column, ManyToOne, JoinColumn, Index } from 'typeorm';\nimport { CommonEntity } from './common.entity';\nimport { ModuleMetadata } from 'src/entities/module-metadata.entity';\n\n@Entity('ss_scheduled_job')\nexport class ScheduledJob extends CommonEntity {\n @Index({ unique: true })\n @Column({ type: \"varchar\" })\n scheduleName: string;\n @Column({ default: false })\n isActive: boolean = false;\n @Column({ type: \"varchar\" })\n frequency: string;\n @Column({ type: \"time\", nullable: true })\n startTime: Date;\n @Column({ type: \"time\", nullable: true })\n endTime: Date;\n @Column({ type: \"date\", nullable: true })\n startDate: Date;\n @Column({ type: \"date\", nullable: true })\n endDate: Date;\n @Column({ type: \"integer\", nullable: true })\n dayOfMonth: number;\n @Column({ nullable: true })\n lastRunAt: Date;\n @Column({ nullable: true })\n nextRunAt: Date;\n @Column({ type: \"varchar\", nullable: true })\n dayOfWeek: string;\n @Column({ type: \"varchar\" })\n job: string;\n @Index()\n @ManyToOne(() => ModuleMetadata, { nullable: false })\n @JoinColumn({ referencedColumnName: 'id' })\n module: ModuleMetadata;\n}\n"]}
1	+ {"version":3,"file":"scheduled-job.entity.js","sourceRoot":"","sources":["../../src/entities/scheduled-job.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCAAuE;AACvE,mDAA+C;AAC/C,qEAAqE;AAG9D,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,4BAAY;IAAvC;;QAKH,aAAQ,GAAY,KAAK,CAAC;KA2B7B;;iIA3BuB,KAAK;;CA2B5B,CAAA;AAhCY,oCAAY;AAGrB;IAFC,IAAA,eAAK,EAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACvB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;kDACP;AAErB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;8CACD;AAE1B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;+CACV;AAElB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC9B,IAAI;+CAAC;AAEhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAChC,IAAI;6CAAC;AAEd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC9B,IAAI;+CAAC;AAEhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAChC,IAAI;6CAAC;AAEd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACzB;AAEnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAChB,IAAI;+CAAC;AAEhB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAChB,IAAI;+CAAC;AAEhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAC1B;AAElB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;yCAChB;AAEZ;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACrB;AAIvB;IAHC,IAAA,eAAK,GAAE;IACP,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,uCAAc,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IACpD,IAAA,oBAAU,EAAC,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC;8BACnC,uCAAc;4CAAC;uBA/Bd,YAAY;IADxB,IAAA,gBAAM,EAAC,kBAAkB,CAAC;GACd,YAAY,CAgCxB","sourcesContent":["import { Entity, Column, ManyToOne, JoinColumn, Index } from 'typeorm';\nimport { CommonEntity } from './common.entity';\nimport { ModuleMetadata } from 'src/entities/module-metadata.entity';\n\n@Entity('ss_scheduled_job')\nexport class ScheduledJob extends CommonEntity {\n @Index({ unique: true })\n @Column({ type: \"varchar\" })\n scheduleName: string;\n @Column({ default: false })\n isActive: boolean = false;\n @Column({ type: \"varchar\" })\n frequency: string;\n @Column({ type: \"time\", nullable: true })\n startTime: Date;\n @Column({ type: \"time\", nullable: true })\n endTime: Date;\n @Column({ type: \"date\", nullable: true })\n startDate: Date;\n @Column({ type: \"date\", nullable: true })\n endDate: Date;\n @Column({ type: \"integer\", nullable: true })\n dayOfMonth: number;\n @Column({ nullable: true })\n lastRunAt: Date;\n @Column({ nullable: true })\n nextRunAt: Date;\n @Column({ type: \"varchar\", nullable: true })\n dayOfWeek: string;\n @Column({ type: \"varchar\" })\n job: string;\n @Column({ type: \"varchar\", nullable: true })\n cronExpression: string;\n @Index()\n @ManyToOne(() => ModuleMetadata, { nullable: false })\n @JoinColumn({ referencedColumnName: 'id' })\n module: ModuleMetadata;\n}\n"]}

package/dist/helpers/command.service.d.ts CHANGED Viewed

@@ -1,5 +1,9 @@
+export type CommandWithArgs = {
+    command: string;
+    args: string[];
+};
 export declare class CommandService {
     private readonly logger;
-    executeCommand(command: string): Promise<string>;
+    executeCommandWithArgs(commandWithArgs: CommandWithArgs): Promise<string>;
 }
 //# sourceMappingURL=command.service.d.ts.map

package/dist/helpers/command.service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"command.service.d.ts","sourceRoot":"","sources":["../../src/helpers/command.service.ts"],"names":[],"mappings":"AAGA,qBACa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmC;~~IAEpD~~,~~cAAc~~,CAAC,~~OAAO~~,EAAE,~~MAAM~~,GAAG,OAAO,CAAC,MAAM,CAAC;~~CAkBvD~~"}
1	+ {"version":3,"file":"command.service.d.ts","sourceRoot":"","sources":["../../src/helpers/command.service.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAEF,qBACa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmC;IAKpD,sBAAsB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC;CA0ChF"}

package/dist/helpers/command.service.js CHANGED Viewed

@@ -14,18 +14,33 @@ let CommandService = CommandService_1 = class CommandService {
     constructor() {
         this.logger = new common_1.Logger(CommandService_1.name);
     }
-    async executeCommand(command) {
-        this.logger.debug(`Executing command :${command}`);
+    async executeCommandWithArgs(commandWithArgs) {
+        const { command, args } = commandWithArgs;
+        this.logger.debug(`Executing command: ${command} ${args.join(' ')}`);
         return new Promise((resolve, reject) => {
-            (0, child_process_1.exec)(command, (error, stdout, stderr) => {
-                if (error) {
-                    this.logger.error(`Error executing command :${command}`, error);
-                    reject(error);
-                    return;
-                }
-                if (stderr) {
-                    this.logger.error(`Error executing command :${command}`, stderr);
-                    reject(stderr);
+            const isWindows = process.platform === 'win32';
+            const spawnCommand = isWindows ? command : command;
+            const spawnArgs = args;
+            const child = (0, child_process_1.spawn)(spawnCommand, spawnArgs, {
+                shell: isWindows,
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
+            let stdout = '';
+            let stderr = '';
+            child.stdout.on('data', (data) => {
+                stdout += data.toString();
+            });
+            child.stderr.on('data', (data) => {
+                stderr += data.toString();
+            });
+            child.on('error', (error) => {
+                this.logger.error(`Error executing command: ${command}`, error);
+                reject(error);
+            });
+            child.on('close', (code) => {
+                if (code !== 0) {
+                    this.logger.error(`Command failed with code ${code}: ${command}`, stderr);
+                    reject(new Error(stderr || `Command failed with exit code ${code}`));
                     return;
                 }
                 resolve(stdout);

package/dist/helpers/command.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"command.service.js","sourceRoot":"","sources":["../../src/helpers/command.service.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAoD;AACpD,~~iDAAqC~~;~~AAG9B~~,IAAM,cAAc,sBAApB,MAAM,cAAc;IAApB;QACY,WAAM,GAAG,IAAI,eAAM,CAAC,gBAAc,CAAC,IAAI,CAAC,CAAC;~~IAoB5D~~,CAAC;~~IAlBC~~,KAAK,CAAC,~~cAAc~~,CAAC,~~OAAe~~;~~QAClC~~,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAC;~~QACnD~~,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC7C,IAAA,~~oBAAI~~,EAAC,~~OAAO~~,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;~~gBACtC~~,IAAI,KAAK,EAAE,CAAC;~~oBACV~~,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;~~oBAChE~~,MAAM,CAAC,KAAK,CAAC,CAAC;~~oBACd~~,~~OAAO~~;~~gBACT~~,CAAC;~~gBACD~~,IAAI,~~MAAM~~,EAAE,CAAC;~~oBACX~~,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;~~oBACjE~~,MAAM,CAAC,MAAM,CAAC,CAAC;~~oBACf~~,OAAO;gBACT,CAAC;gBACD,OAAO,CAAC,MAAM,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;~~AArBY~~,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;GACA,cAAc,~~CAqB1B~~","sourcesContent":["import { Injectable, Logger } from '@nestjs/common';\nimport { ~~exec~~ } from 'child_process';\n\n@Injectable()\nexport class CommandService {\n private readonly logger = new Logger(CommandService.name);\n\n async ~~executeCommand~~(~~command~~: ~~string~~): Promise<string> {\n this.logger.debug(`Executing command :${command}`);\n return new Promise<string>((resolve, reject) => {\n ~~exec~~(command, (~~error~~, stdout, ~~stderr~~) => {\n if (error) {\n this.logger.error(`Error executing command :${command}`, error);\n reject(error);\n ~~return~~;\n }\n if (~~stderr~~) {\n this.logger.error(`~~Error~~ ~~executing~~ ~~command~~ :${command}`, stderr);\n reject(stderr);\n return;\n }\n resolve(stdout);\n });\n });\n }\n}\n"]}
1	+ {"version":3,"file":"command.service.js","sourceRoot":"","sources":["../../src/helpers/command.service.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAoD;AACpD,iDAAsC;AAQ/B,IAAM,cAAc,sBAApB,MAAM,cAAc;IAApB;QACY,WAAM,GAAG,IAAI,eAAM,CAAC,gBAAc,CAAC,IAAI,CAAC,CAAC;IA+C5D,CAAC;IA1CC,KAAK,CAAC,sBAAsB,CAAC,eAAgC;QAC3D,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAErE,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC7C,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;YAG/C,MAAM,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;YACnD,MAAM,SAAS,GAAG,IAAI,CAAC;YAEvB,MAAM,KAAK,GAAG,IAAA,qBAAK,EAAC,YAAY,EAAE,SAAS,EAAE;gBAC3C,KAAK,EAAE,SAAS;gBAChB,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;aAChC,CAAC,CAAC;YAEH,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI,MAAM,GAAG,EAAE,CAAC;YAEhB,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC/B,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,CAAC,CAAC,CAAC;YAEH,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC/B,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,CAAC,CAAC,CAAC;YAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;gBAChE,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;YAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;gBACzB,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;oBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,IAAI,KAAK,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;oBAC1E,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,IAAI,iCAAiC,IAAI,EAAE,CAAC,CAAC,CAAC;oBACrE,OAAO;gBACT,CAAC;gBACD,OAAO,CAAC,MAAM,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAhDY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;GACA,cAAc,CAgD1B","sourcesContent":["import { Injectable, Logger } from '@nestjs/common';\nimport { spawn } from 'child_process';\n\nexport type CommandWithArgs = {\n command: string;\n args: string[];\n};\n\n@Injectable()\nexport class CommandService {\n private readonly logger = new Logger(CommandService.name);\n\n /*\n Execute a command with arguments array (cross-platform compatible)\n */\n async executeCommandWithArgs(commandWithArgs: CommandWithArgs): Promise<string> {\n const { command, args } = commandWithArgs;\n this.logger.debug(`Executing command: ${command} ${args.join(' ')}`);\n\n return new Promise<string>((resolve, reject) => {\n const isWindows = process.platform === 'win32';\n\n // On Windows, we need to use cmd /c for commands that might be .cmd files (like npm scripts)\n const spawnCommand = isWindows ? command : command;\n const spawnArgs = args;\n\n const child = spawn(spawnCommand, spawnArgs, {\n shell: isWindows, // Use shell on Windows to handle .cmd files\n stdio: ['pipe', 'pipe', 'pipe'],\n });\n\n let stdout = '';\n let stderr = '';\n\n child.stdout.on('data', (data) => {\n stdout += data.toString();\n });\n\n child.stderr.on('data', (data) => {\n stderr += data.toString();\n });\n\n child.on('error', (error) => {\n this.logger.error(`Error executing command: ${command}`, error);\n reject(error);\n });\n\n child.on('close', (code) => {\n if (code !== 0) {\n this.logger.error(`Command failed with code ${code}: ${command}`, stderr);\n reject(new Error(stderr \|\| `Command failed with exit code ${code}`));\n return;\n }\n resolve(stdout);\n });\n });\n }\n}\n"]}

package/dist/helpers/field-crud-managers/ManyToOneRelationFieldCrudManager.js CHANGED Viewed

@@ -52,13 +52,13 @@ class ManyToOneRelationFieldCrudManager {
         if ((0, class_validator_1.isNotEmpty)(fieldId)) {
             dto[this.options.fieldName] = await this.options.entityManager.getRepository(coModelEntityName).findOneBy({ id: fieldId });
             if (this.options.required && (0, class_validator_1.isEmpty)(dto[this.options.fieldName])) {
-                throw new Error(`ManyToOneRelationFieldCrudManager: Record with id: ${fieldId} not found in ${this.options.relationCoModelSingularName}`);
+                throw new Error(`Field ${this.options.fieldName} resolution failed. Record with id: ${fieldId} not found in ${this.options.relationCoModelSingularName}`);
             }
         }
         else {
             dto[this.options.fieldName] = await this.options.entityManager.getRepository(coModelEntityName).findOneBy({ [this.options.relationCoModelUserKeyFieldName]: fieldUserKeyValue });
             if (this.options.required && (0, class_validator_1.isEmpty)(dto[this.options.fieldName])) {
-                throw new Error(`ManyToOneRelationFieldCrudManager: Record with userKey: ${this.options.relationCoModelUserKeyFieldName}: ${fieldUserKeyValue} not found in ${this.options.relationCoModelSingularName}`);
+                throw new Error(`Field ${this.options.fieldName} resolution failed. Record with userKey: ${this.options.relationCoModelUserKeyFieldName}: ${fieldUserKeyValue} not found in ${this.options.relationCoModelSingularName}`);
             }
         }
         return dto;

package/dist/helpers/field-crud-managers/ManyToOneRelationFieldCrudManager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ManyToOneRelationFieldCrudManager.js","sourceRoot":"","sources":["../../../src/helpers/field-crud-managers/ManyToOneRelationFieldCrudManager.ts"],"names":[],"mappings":"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~~sDAAsD~~,OAAO,iBAAiB,IAAI,CAAC,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC;~~YAC9I~~,CAAC;QACL,CAAC;aACI,CAAC;YACF,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,+BAA+B,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC;YACjL,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAA,yBAAO,EAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;gBAChE,MAAM,IAAI,KAAK,CAAC,~~2DAA2D~~,IAAI,CAAC,OAAO,CAAC,+BAA+B,KAAK,iBAAiB,iBAAiB,IAAI,CAAC,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC;~~YAC9M~~,CAAC;QACL,CAAC;QAGD,OAAO,GAAG,CAAC;IACf,CAAC;IAEO,yBAAyB;QAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;IACjC,CAAC;CASJ;AArFD,8EAqFC","sourcesContent":["import { classify } from \"@angular-devkit/core/src/utils/strings\";\nimport { BadRequestException } from \"@nestjs/common\";\nimport { isEmpty, isNotEmpty, isString } from \"class-validator\";\nimport { FieldCrudManager, ValidationError } from \"src/interfaces\";\nimport { IsParsableInt } from \"src/validators/is-parsable-int\";\nimport { EntityManager } from \"typeorm\";\n\nexport interface ManyToOneRelationFieldOptions {\n // Add options for relation field\n required: boolean \| undefined \| null;\n relationCoModelSingularName: string \| undefined \| null;\n fieldName: string \| undefined \| null;\n // modelUserKeyFieldName: string \| undefined \| null;\n modelSingularName: string \| undefined \| null;\n entityManager: EntityManager;\n relationCoModelUserKeyFieldName: string \| undefined \| null; \n}\n\n// This implementation is meant to be used for many-to-one relation field\nexport class ManyToOneRelationFieldCrudManager implements FieldCrudManager {\n private idFieldName: string;\n private userKeyFieldName: string;\n constructor(private readonly options: ManyToOneRelationFieldOptions) {\n // this.options = options;\n this.idFieldName = `${options.fieldName}Id`;\n this.userKeyFieldName = `${options.fieldName}UserKey`;\n }\n validate(dto: any) {\n const fieldId: number = dto[this.idFieldName];\n const fieldUserKey: string = dto[this.userKeyFieldName];\n return this.applyValidations(fieldId, fieldUserKey);\n }\n\n private applyValidations(fieldId: any, fieldUserKey: string): ValidationError[] {\n const errors: ValidationError[] = [];\n this.isApplyRequiredValidation() && isEmpty(fieldId) && isEmpty(fieldUserKey) ? errors.push({ field: this.options.fieldName, error: `Field: ${this.options.fieldName} is required. Either pass ${this.idFieldName} or ${this.userKeyFieldName}.` }) : \"no errors\";\n if (isNotEmpty(fieldId)) {\n errors.push(...this.applyIdFormatValidations(fieldId));\n }\n if (isNotEmpty(fieldUserKey)) {\n errors.push(...this.applyUserKeyFormatValidations(fieldUserKey));\n }\n return errors;\n }\n\n private applyIdFormatValidations(fieldId: any): ValidationError[] { //FIXME fieldId is any because it can be string or number. Keeping it any for compatibility with isParsableInt. \n const errors: ValidationError[] = [];\n !IsParsableInt(fieldId) ? errors.push({ field: this.options.fieldName, error: 'Field is not a integer' }) : \"no errors\";\n return errors;\n }\n\n private applyUserKeyFormatValidations(fieldUserKey: string): ValidationError[] {\n const errors: ValidationError[] = [];\n !isString(fieldUserKey) ? errors.push({ field: this.options.fieldName, error: 'Field is not a string' }) : \"no errors\";\n if (isEmpty(this.options.relationCoModelUserKeyFieldName)) {\n errors.push({ field: this.options.fieldName, error: `UserKey field name is not defined in the model ${this.options.relationCoModelSingularName}` });\n }\n return errors;\n }\n\n async transformForCreate(dto: any): Promise<any> {\n const fieldId: number = dto[this.idFieldName];\n const fieldUserKeyValue: string = dto[this.userKeyFieldName];\n\n // Avoid transforming if both fieldId and fieldUserKey is empty\n if ((isEmpty(fieldId)) && isEmpty(fieldUserKeyValue)) return dto;\n\n if (!this.options.relationCoModelSingularName) {\n throw new BadRequestException(`ManyToOneRelationFieldCrudManager: relationCoModelSingularName is not defined in the field: ${this.options.fieldName}`);\n }\n // // Load the related entity from the database, using the repository of the related entity\n //const entityTarget = this.getRelatedEntityTarget(classify(this.options.relationCoModelSingularName));\n const coModelEntityName = classify(this.options.relationCoModelSingularName);\n\n //Load the related entity from the database, using the repository of the related entity\n //const entityTarget = this.getRelatedEntityTarget(classify(this.options.relationCoModelSingularName));\n if (isNotEmpty(fieldId)) {\n dto[this.options.fieldName] = await this.options.entityManager.getRepository(coModelEntityName).findOneBy({ id: fieldId });\n if (this.options.required && isEmpty(dto[this.options.fieldName])) {\n throw new Error(`~~ManyToOneRelationFieldCrudManager:~~ Record with id: ${fieldId} not found in ${this.options.relationCoModelSingularName}`);\n }\n }\n else {\n dto[this.options.fieldName] = await this.options.entityManager.getRepository(coModelEntityName).findOneBy({ [this.options.relationCoModelUserKeyFieldName]: fieldUserKeyValue });\n if (this.options.required && isEmpty(dto[this.options.fieldName])) {\n throw new Error(`~~ManyToOneRelationFieldCrudManager:~~ Record with userKey: ${this.options.relationCoModelUserKeyFieldName}: ${fieldUserKeyValue} not found in ${this.options.relationCoModelSingularName}`);\n }\n }\n\n\n return dto;\n }\n\n private isApplyRequiredValidation(): boolean {\n return this.options.required;\n }\n\n // Returns the entity target class from the entity name\n // private getRelatedEntityTarget(relatedEntityName: string): any {\n // const entityMetadatas = this.options.entityManager.connection.entityMetadatas;\n // const relatedEntityMetadata = entityMetadatas.find(em => em.name === relatedEntityName);\n // return relatedEntityMetadata.target;\n // }\n\n}"]}
1	+ {"version":3,"file":"ManyToOneRelationFieldCrudManager.js","sourceRoot":"","sources":["../../../src/helpers/field-crud-managers/ManyToOneRelationFieldCrudManager.ts"],"names":[],"mappings":"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","sourcesContent":["import { classify } from \"@angular-devkit/core/src/utils/strings\";\nimport { BadRequestException } from \"@nestjs/common\";\nimport { isEmpty, isNotEmpty, isString } from \"class-validator\";\nimport { FieldCrudManager, ValidationError } from \"src/interfaces\";\nimport { IsParsableInt } from \"src/validators/is-parsable-int\";\nimport { EntityManager } from \"typeorm\";\n\nexport interface ManyToOneRelationFieldOptions {\n // Add options for relation field\n required: boolean \| undefined \| null;\n relationCoModelSingularName: string \| undefined \| null;\n fieldName: string \| undefined \| null;\n // modelUserKeyFieldName: string \| undefined \| null;\n modelSingularName: string \| undefined \| null;\n entityManager: EntityManager;\n relationCoModelUserKeyFieldName: string \| undefined \| null; \n}\n\n// This implementation is meant to be used for many-to-one relation field\nexport class ManyToOneRelationFieldCrudManager implements FieldCrudManager {\n private idFieldName: string;\n private userKeyFieldName: string;\n constructor(private readonly options: ManyToOneRelationFieldOptions) {\n // this.options = options;\n this.idFieldName = `${options.fieldName}Id`;\n this.userKeyFieldName = `${options.fieldName}UserKey`;\n }\n validate(dto: any) {\n const fieldId: number = dto[this.idFieldName];\n const fieldUserKey: string = dto[this.userKeyFieldName];\n return this.applyValidations(fieldId, fieldUserKey);\n }\n\n private applyValidations(fieldId: any, fieldUserKey: string): ValidationError[] {\n const errors: ValidationError[] = [];\n this.isApplyRequiredValidation() && isEmpty(fieldId) && isEmpty(fieldUserKey) ? errors.push({ field: this.options.fieldName, error: `Field: ${this.options.fieldName} is required. Either pass ${this.idFieldName} or ${this.userKeyFieldName}.` }) : \"no errors\";\n if (isNotEmpty(fieldId)) {\n errors.push(...this.applyIdFormatValidations(fieldId));\n }\n if (isNotEmpty(fieldUserKey)) {\n errors.push(...this.applyUserKeyFormatValidations(fieldUserKey));\n }\n return errors;\n }\n\n private applyIdFormatValidations(fieldId: any): ValidationError[] { //FIXME fieldId is any because it can be string or number. Keeping it any for compatibility with isParsableInt. \n const errors: ValidationError[] = [];\n !IsParsableInt(fieldId) ? errors.push({ field: this.options.fieldName, error: 'Field is not a integer' }) : \"no errors\";\n return errors;\n }\n\n private applyUserKeyFormatValidations(fieldUserKey: string): ValidationError[] {\n const errors: ValidationError[] = [];\n !isString(fieldUserKey) ? errors.push({ field: this.options.fieldName, error: 'Field is not a string' }) : \"no errors\";\n if (isEmpty(this.options.relationCoModelUserKeyFieldName)) {\n errors.push({ field: this.options.fieldName, error: `UserKey field name is not defined in the model ${this.options.relationCoModelSingularName}` });\n }\n return errors;\n }\n\n async transformForCreate(dto: any): Promise<any> {\n const fieldId: number = dto[this.idFieldName];\n const fieldUserKeyValue: string = dto[this.userKeyFieldName];\n\n // Avoid transforming if both fieldId and fieldUserKey is empty\n if ((isEmpty(fieldId)) && isEmpty(fieldUserKeyValue)) return dto;\n\n if (!this.options.relationCoModelSingularName) {\n throw new BadRequestException(`ManyToOneRelationFieldCrudManager: relationCoModelSingularName is not defined in the field: ${this.options.fieldName}`);\n }\n // // Load the related entity from the database, using the repository of the related entity\n //const entityTarget = this.getRelatedEntityTarget(classify(this.options.relationCoModelSingularName));\n const coModelEntityName = classify(this.options.relationCoModelSingularName);\n\n //Load the related entity from the database, using the repository of the related entity\n //const entityTarget = this.getRelatedEntityTarget(classify(this.options.relationCoModelSingularName));\n if (isNotEmpty(fieldId)) {\n dto[this.options.fieldName] = await this.options.entityManager.getRepository(coModelEntityName).findOneBy({ id: fieldId });\n if (this.options.required && isEmpty(dto[this.options.fieldName])) {\n throw new Error(`Field ${this.options.fieldName} resolution failed. Record with id: ${fieldId} not found in ${this.options.relationCoModelSingularName}`);\n }\n }\n else {\n dto[this.options.fieldName] = await this.options.entityManager.getRepository(coModelEntityName).findOneBy({ [this.options.relationCoModelUserKeyFieldName]: fieldUserKeyValue });\n if (this.options.required && isEmpty(dto[this.options.fieldName])) {\n throw new Error(`Field ${this.options.fieldName} resolution failed. Record with userKey: ${this.options.relationCoModelUserKeyFieldName}: ${fieldUserKeyValue} not found in ${this.options.relationCoModelSingularName}`);\n }\n }\n\n\n return dto;\n }\n\n private isApplyRequiredValidation(): boolean {\n return this.options.required;\n }\n\n // Returns the entity target class from the entity name\n // private getRelatedEntityTarget(relatedEntityName: string): any {\n // const entityMetadatas = this.options.entityManager.connection.entityMetadatas;\n // const relatedEntityMetadata = entityMetadatas.find(em => em.name === relatedEntityName);\n // return relatedEntityMetadata.target;\n // }\n\n}"]}

package/dist/helpers/schematic.service.d.ts CHANGED Viewed

@@ -27,11 +27,12 @@ export declare class SchematicService {
     private readonly solidRegistry;
     private readonly logger;
     private readonly SCHEMATIC_PROJECT;
+    private readonly SCHEMATICS_COMMAND;
     constructor(commandService: CommandService, solidRegistry: SolidRegistry);
     executeSchematicCommand(command: string, options: GenerateModuleOptions | ModelAndFieldGenerationOptions, debug?: boolean): Promise<string>;
     private generateSchematicCommand;
-    private buildFieldGenerationCommand;
-    private buildModelGenerationCommand;
+    private buildFieldGenerationArgs;
+    private buildModelGenerationArgs;
 }
 export {};
 //# sourceMappingURL=schematic.service.d.ts.map

package/dist/helpers/schematic.service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"schematic.service.d.ts","sourceRoot":"","sources":["../../src/helpers/schematic.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,cAAc,~~EAAE~~,MAAM,mBAAmB,CAAC;~~AACnD~~,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,eAAO,MAAM,kBAAkB,eAAe,CAAC;AAC/C,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF,KAAK,8BAA8B,GAAG;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,aAAa,EAAE,CAAC;CACzB,CAAC;AACF,eAAO,MAAM,qBAAqB,kBAAkB,CAAC;AACrD,eAAO,MAAM,qBAAqB,kBAAkB,CAAC;AAGrD,qBACa,gBAAgB;~~IAGf~~,OAAO,CAAC,QAAQ,CAAC,cAAc;IAAkB,OAAO,CAAC,QAAQ,CAAC,aAAa;~~IAF3F~~,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqC;IAC5D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuC;~~gBAC5C~~,cAAc,EAAE,cAAc,EAAmB,aAAa,EAAE,aAAa;IAEpG,uBAAuB,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,qBAAqB,GAAG,8BAA8B,EAC/D,KAAK,UAAQ,GACZ,OAAO,CAAC,MAAM,CAAC;~~IAMlB~~,OAAO,CAAC,wBAAwB;~~IA0BhC~~,OAAO,CAAC,~~2BAA2B~~;~~IAWnC~~,OAAO,CAAC,~~2BAA2B~~;~~CA6CpC~~"}
1	+ {"version":3,"file":"schematic.service.d.ts","sourceRoot":"","sources":["../../src/helpers/schematic.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAmB,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,eAAO,MAAM,kBAAkB,eAAe,CAAC;AAC/C,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF,KAAK,8BAA8B,GAAG;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,aAAa,EAAE,CAAC;CACzB,CAAC;AACF,eAAO,MAAM,qBAAqB,kBAAkB,CAAC;AACrD,eAAO,MAAM,qBAAqB,kBAAkB,CAAC;AAGrD,qBACa,gBAAgB;IAKf,OAAO,CAAC,QAAQ,CAAC,cAAc;IAAkB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAJ3F,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqC;IAC5D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAuC;IACzE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAgB;gBAEtB,cAAc,EAAE,cAAc,EAAmB,aAAa,EAAE,aAAa;IAEpG,uBAAuB,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,qBAAqB,GAAG,8BAA8B,EAC/D,KAAK,UAAQ,GACZ,OAAO,CAAC,MAAM,CAAC;IAKlB,OAAO,CAAC,wBAAwB;IA4BhC,OAAO,CAAC,wBAAwB;IAWhC,OAAO,CAAC,wBAAwB;CAgDjC"}

package/dist/helpers/schematic.service.js CHANGED Viewed

@@ -24,74 +24,79 @@ let SchematicService = SchematicService_1 = class SchematicService {
         this.solidRegistry = solidRegistry;
         this.logger = new common_1.Logger(SchematicService_1.name);
         this.SCHEMATIC_PROJECT = '@solidstarters/solid-code-builder';
+        this.SCHEMATICS_COMMAND = 'schematics';
     }
     async executeSchematicCommand(command, options, debug = false) {
-        return await this.commandService.executeCommand(this.generateSchematicCommand(command, options, debug));
+        const commandWithArgs = this.generateSchematicCommand(command, options, debug);
+        return await this.commandService.executeCommandWithArgs(commandWithArgs);
     }
     generateSchematicCommand(command, options, debug) {
-        const baseCommand = `schematics ${this.SCHEMATIC_PROJECT}:${command} --debug=${debug}`;
+        const schematicName = `${this.SCHEMATIC_PROJECT}:${command}`;
+        const baseArgs = [schematicName, `--debug=${debug}`];
         if (command === exports.REMOVE_FIELDS_COMMAND ||
             command === exports.REFRESH_MODEL_COMMAND) {
             const { fields, ...modelSpecificOptions } = options;
-            const modelCommand = this.buildModelGenerationCommand(baseCommand, modelSpecificOptions);
-            const fieldCommand = this.buildFieldGenerationCommand(fields);
-            const schematicCommand = modelCommand + ' ' + fieldCommand;
-            this.logger.debug('schematicCommand', schematicCommand);
-            return schematicCommand;
+            const modelArgs = this.buildModelGenerationArgs(modelSpecificOptions);
+            const fieldArgs = this.buildFieldGenerationArgs(fields);
+            const args = [...baseArgs, ...modelArgs, ...fieldArgs];
+            this.logger.debug('schematicCommand args', args);
+            return { command: this.SCHEMATICS_COMMAND, args };
         }
         else if (command === exports.ADD_MODULE_COMMAND) {
             const moduleOptions = options;
-            const schematicCommand = ` ${baseCommand} --module=${moduleOptions.module}`;
-            this.logger.debug('schematicCommand', schematicCommand);
-            return schematicCommand;
+            const args = [...baseArgs, `--module=${moduleOptions.module}`];
+            this.logger.debug('schematicCommand args', args);
+            return { command: this.SCHEMATICS_COMMAND, args };
         }
         else {
             throw new Error('Schematic command not supported.');
         }
     }
-    buildFieldGenerationCommand(fields) {
+    buildFieldGenerationArgs(fields) {
         return fields
             .filter((field) => {
             return !this.solidRegistry.getCommonEntityKeys().map(key => key.toString()).includes(field.name);
         })
             .map((field) => {
-            return `--fields='${JSON.stringify(field).replace(/'/g, "\\'")}'`;
-        })
-            .join(' ');
+            return `--fields=${JSON.stringify(field)}`;
+        });
     }
-    buildModelGenerationCommand(baseCommand, modelSpecificOptions) {
-        let modelCommand = `${baseCommand} --module=${modelSpecificOptions.module} --model=${modelSpecificOptions.model}`;
+    buildModelGenerationArgs(modelSpecificOptions) {
+        const args = [
+            `--module=${modelSpecificOptions.module}`,
+            `--model=${modelSpecificOptions.model}`,
+        ];
         if (modelSpecificOptions.moduleDisplayName) {
-            modelCommand += ` --module-display-name=${(0, lodash_1.snakeCase)(modelSpecificOptions.moduleDisplayName)}`;
+            args.push(`--module-display-name=${(0, lodash_1.snakeCase)(modelSpecificOptions.moduleDisplayName)}`);
         }
         if (modelSpecificOptions.table) {
-            modelCommand += ` --table=${modelSpecificOptions.table}`;
+            args.push(`--table=${modelSpecificOptions.table}`);
         }
         if (modelSpecificOptions.dataSource) {
-            modelCommand += ` --data-source=${modelSpecificOptions.dataSource}`;
+            args.push(`--data-source=${modelSpecificOptions.dataSource}`);
         }
         if (modelSpecificOptions.modelEnableSoftDelete) {
-            modelCommand += ` --model-enable-soft-delete=${modelSpecificOptions.modelEnableSoftDelete}`;
+            args.push(`--model-enable-soft-delete=${modelSpecificOptions.modelEnableSoftDelete}`);
         }
         if (modelSpecificOptions.parentModel) {
-            modelCommand += ` --parent-model=${modelSpecificOptions.parentModel}`;
+            args.push(`--parent-model=${modelSpecificOptions.parentModel}`);
         }
         if (modelSpecificOptions.parentModule) {
-            modelCommand += ` --parent-module=${modelSpecificOptions.parentModule}`;
+            args.push(`--parent-module=${modelSpecificOptions.parentModule}`);
         }
         if (modelSpecificOptions.draftPublishWorkflowEnabled) {
-            modelCommand += ` --draft-publish-workflow-enabled=${modelSpecificOptions.draftPublishWorkflowEnabled}`;
+            args.push(`--draft-publish-workflow-enabled=${modelSpecificOptions.draftPublishWorkflowEnabled}`);
         }
         if (modelSpecificOptions.isLegacyTable) {
-            modelCommand += ` --is-legacy-table=${modelSpecificOptions.isLegacyTable}`;
+            args.push(`--is-legacy-table=${modelSpecificOptions.isLegacyTable}`);
         }
         if (modelSpecificOptions.isLegacyTableWithId) {
-            modelCommand += ` --is-legacy-table-with-id=${modelSpecificOptions.isLegacyTableWithId}`;
+            args.push(`--is-legacy-table-with-id=${modelSpecificOptions.isLegacyTableWithId}`);
         }
         if (modelSpecificOptions.dataSourceType) {
-            modelCommand += ` --data-source-type=${modelSpecificOptions.dataSourceType}`;
+            args.push(`--data-source-type=${modelSpecificOptions.dataSourceType}`);
         }
-        return modelCommand;
+        return args;
     }
 };
 exports.SchematicService = SchematicService;

package/dist/helpers/schematic.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"schematic.service.js","sourceRoot":"","sources":["../../src/helpers/schematic.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,mCAAmC;AAEnC,~~uDAAmD~~;~~AACnD~~,qDAAiD;AAEpC,QAAA,kBAAkB,GAAG,YAAY,CAAC;AAqBlC,QAAA,qBAAqB,GAAG,eAAe,CAAC;AACxC,QAAA,qBAAqB,GAAG,eAAe,CAAC;AAI9C,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;~~IAG3B~~,YAA6B,cAA8B,EAAmB,aAA4B;QAA7E,mBAAc,GAAd,cAAc,CAAgB;QAAmB,kBAAa,GAAb,aAAa,CAAe;~~QAFzF~~,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAgB,CAAC,IAAI,CAAC,CAAC;QAC3C,sBAAiB,GAAG,mCAAmC,CAAC;~~IACqC~~,CAAC;IAE/G,KAAK,CAAC,uBAAuB,CAC3B,OAAe,EACf,OAA+D,EAC/D,KAAK,GAAG,KAAK;QAEb,~~OAAO,~~MAAM,~~IAAI~~,~~CAAC~~,~~cAAc,CAAC,cAAc,CAC7C,~~IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,~~CACvD~~,CAAC;~~IACJ~~,CAAC;IAEO,wBAAwB,CAC9B,OAAe,EACf,OAA+D,EAC/D,KAAc;QAEd,MAAM,~~WAAW~~,GAAG,~~cAAc~~,IAAI,CAAC,iBAAiB,IAAI,OAAO,~~YAAY~~,KAAK,EAAE,CAAC;~~QACvF~~,IACE,OAAO,KAAK,6BAAqB;YACjC,OAAO,KAAK,6BAAqB,EACjC,CAAC;YACD,MAAM,~~EAAC~~,MAAM,EAAE,GAAG,oBAAoB,~~EAAC~~,GAAG,OAAyC,CAAC;~~YACpF~~,MAAM,~~YAAY~~,GAAG,IAAI,CAAC,~~2BAA2B~~,CAAC,~~WAAW,EAAE,~~oBAAoB,CAAC,CAAC;~~YACzF~~,MAAM,~~YAAY~~,GAAG,IAAI,CAAC,~~2BAA2B~~,CAAC,MAAM,CAAC,CAAC;~~YAC9D~~,MAAM,~~gBAAgB~~,GAAG,~~YAAY~~,GAAG,GAAG,GAAG,~~YAAY~~,CAAC;~~YAC3D~~,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,~~kBAAkB~~,EAAE,~~gBAAgB~~,CAAC,CAAC;~~YACxD~~,OAAO,~~gBAAgB~~,CAAC;~~QAC1B~~,CAAC;aAAM,IAAI,OAAO,KAAK,0BAAkB,EAAE,CAAC;YAC1C,MAAM,aAAa,GAAG,OAAgC,CAAC;YACvD,MAAM,~~gBAAgB~~,GAAG,~~IAAI~~,~~WAAW~~,~~aAAa~~,aAAa,CAAC,MAAM,EAAE,CAAC;~~YAC5E~~,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,~~kBAAkB~~,EAAE,~~gBAAgB~~,CAAC,CAAC;~~YACxD~~,OAAO,~~gBAAgB~~,CAAC;~~QAC1B~~,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAEO,~~2BAA2B~~,CAAC,MAAuB;~~QACzD~~,OAAO,MAAM;aACV,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YAChB,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACnG,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;~~YACb~~,OAAO,~~aAAa~~,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,~~CAAC,OAAO,CAAC,IAAI,~~EAAE,~~KAAK,~~CAAC~~,GAAG,CAAC~~;~~QACpE~~,CAAC,CAAC~~;aACD~~,~~IAAI,~~CAAC~~,GAAG,CAAC,CAAC~~;~~IACf~~,CAAC;IAEO,~~2BAA2B~~,CAAC,~~WAAmB,EAAE,~~oBAA4C;~~QACnG~~,IAAI,YAAY,~~GAAG,GAAG,WAAW,aAAa,~~oBAAoB,CAAC,MAAM,~~YAAY~~,oBAAoB,CAAC,KAAK,EAAE,CAAC;~~QAGlH~~,IAAI,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;YAC3C,~~YAAY~~,IAAI,~~0BAA0B~~,IAAA,kBAAS,EAAC,oBAAoB,CAAC,iBAAiB,CAAC,EAAE,CAAC;~~QAChG~~,CAAC;QAED,IAAI,oBAAoB,CAAC,KAAK,EAAE,CAAC;YAC/B,~~YAAY~~,IAAI,~~YAAY~~,oBAAoB,CAAC,KAAK,EAAE,CAAC;~~QAC3D~~,CAAC;QAED,IAAI,oBAAoB,CAAC,UAAU,EAAE,CAAC;YACpC,~~YAAY~~,IAAI,~~kBAAkB~~,oBAAoB,CAAC,UAAU,EAAE,CAAC;~~QACtE~~,CAAC;QAED,IAAI,oBAAoB,CAAC,qBAAqB,EAAE,CAAC;YAC/C,~~YAAY~~,IAAI~~,+BAA+B~~,oBAAoB,CAAC,qBAAqB,EAAE,CAAC;~~QAC9F~~,CAAC;QAED,IAAI,oBAAoB,CAAC,WAAW,EAAE,CAAC;YACrC,~~YAAY~~,IAAI,~~mBAAmB~~,oBAAoB,CAAC,WAAW,EAAE,CAAC;~~QACxE~~,CAAC;~~QACD~~,IAAI,oBAAoB,CAAC,YAAY,EAAE,CAAC;YACtC,~~YAAY~~,IAAI,~~oBAAoB~~,oBAAoB,CAAC,YAAY,EAAE,CAAC;~~QAC1E~~,CAAC;QAED,IAAI,oBAAoB,CAAC,2BAA2B,EAAE,CAAC;YACrD,~~YAAY~~,IAAI,~~qCAAqC~~,oBAAoB,CAAC,2BAA2B,EAAE,CAAC;~~QAC1G~~,CAAC;QAED,IAAI,oBAAoB,CAAC,aAAa,EAAE,CAAC;YACvC,~~YAAY~~,IAAI,~~sBAAsB~~,oBAAoB,CAAC,aAAa,EAAE,CAAC;~~QAC7E~~,CAAC;QAED,IAAI,oBAAoB,CAAC,mBAAmB,EAAE,CAAC;YAC7C,~~YAAY~~,IAAI,~~8BAA8B~~,oBAAoB,CAAC,mBAAmB,EAAE,CAAC;~~QAC3F~~,CAAC;QAED,IAAI,oBAAoB,CAAC,cAAc,EAAE,CAAC;YACxC,~~YAAY~~,IAAI,~~uBAAuB~~,oBAAoB,CAAC,cAAc,EAAE,CAAC;~~QAC/E~~,CAAC;QAED,OAAO,~~YAAY~~,CAAC;~~IACtB~~,CAAC;CACF,CAAA;~~AAjGY~~,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;~~qCAIkC~~,gCAAc,EAAkC,8BAAa;~~GAH~~/F,gBAAgB,~~CAiG5B~~","sourcesContent":["import { Injectable, Logger } from '@nestjs/common';\nimport { snakeCase } from \"lodash\";\nimport { FieldMetadata } from 'src/entities/field-metadata.entity';\nimport { CommandService } from './command.service';\nimport { SolidRegistry } from './solid-registry';\n\nexport const ADD_MODULE_COMMAND = 'add-module';\nexport type GenerateModuleOptions = {\n module: string;\n};\ntype ModelGenerationOptions = Omit<ModelAndFieldGenerationOptions, 'fields'>;\n\ntype ModelAndFieldGenerationOptions = {\n module: string;\n model: string;\n moduleDisplayName: string;\n table?: string;\n dataSource: string;\n modelEnableSoftDelete?: boolean;\n parentModel?: string~~; \~~n parentModule?: string;\n draftPublishWorkflowEnabled?: boolean;\n isLegacyTable?: boolean;\n isLegacyTableWithId?: boolean;\n dataSourceType?: string;\n fields: FieldMetadata[]; //FIXME This type can be improved\n};\nexport const REMOVE_FIELDS_COMMAND = 'remove-fields';\nexport const REFRESH_MODEL_COMMAND = 'refresh-model';\n\n//TODO Rename to CodeBuilder service\n@Injectable()\nexport class SchematicService {\n private readonly logger = new Logger(SchematicService.name);\n private readonly SCHEMATIC_PROJECT = '@solidstarters/solid-code-builder';\n constructor(private readonly commandService: CommandService, private readonly solidRegistry: SolidRegistry) { }\n\n async executeSchematicCommand(\n command: string,\n options: GenerateModuleOptions \| ModelAndFieldGenerationOptions,\n debug = false,\n ): Promise<string> {\n ~~return~~ ~~await~~ this.~~commandService.executeCommand(\n this.~~generateSchematicCommand(command, options, debug),\n );\n }\n\n private generateSchematicCommand(\n command: string,\n options: GenerateModuleOptions \| ModelAndFieldGenerationOptions,\n debug: boolean,\n ): ~~string~~ {\n const ~~baseCommand~~ = ~~`schematics $~~{this.SCHEMATIC_PROJECT}:${command} --debug=${debug}~~`;\~~n if (\n command === REMOVE_FIELDS_COMMAND \|\|\n command === REFRESH_MODEL_COMMAND\n ) {\n const {fields, ...modelSpecificOptions} = options as ModelAndFieldGenerationOptions;\n const ~~modelCommand~~ = this.~~buildModelGenerationCommand~~(~~baseCommand,~~ modelSpecificOptions);\n const ~~fieldCommand~~ = this.~~buildFieldGenerationCommand~~(fields);\n const ~~schematicCommand~~ = ~~modelCommand~~ + ~~' ' + fieldCommand~~;\n this.logger.debug('schematicCommand', ~~schematicCommand~~);\n return ~~schematicCommand~~;\n } else if (command === ADD_MODULE_COMMAND) {\n const moduleOptions = options as GenerateModuleOptions;\n const ~~schematicCommand~~ = ` ~~${baseCommand} --~~module=${moduleOptions.module}~~`;\~~n this.logger.debug('schematicCommand', ~~schematicCommand~~);\n return ~~schematicCommand~~;\n } else {\n throw new Error('Schematic command not supported.');\n }\n }\n\n private ~~buildFieldGenerationCommand~~(fields: FieldMetadata[]) {\n return fields\n .filter((field) => {\n return !this.solidRegistry.getCommonEntityKeys().map(key => key.toString()).includes(field.name);\n })\n .map((field) => {\n return `--fields~~='$~~{JSON.stringify(field)~~.replace(/'/g, \"\\\\'\")~~}'`;\n })~~\n .join(' ')~~;\n }\n\n private ~~buildModelGenerationCommand~~(~~baseCommand: string,~~ modelSpecificOptions: ModelGenerationOptions): string {\n ~~let~~ ~~modelCommand~~ = ~~`${baseCommand} --~~module=${modelSpecificOptions.module} --model=${modelSpecificOptions.model}~~`;\~~n\n ~~// Make below options code generate i.e if option exists then add to command with proper casing~~\n if (modelSpecificOptions.moduleDisplayName) {\n ~~modelCommand += ` --~~module-display-name=${snakeCase(modelSpecificOptions.moduleDisplayName)}~~`;\~~n }\n\n if (modelSpecificOptions.table) {\n ~~modelCommand += ` --~~table=${modelSpecificOptions.table}~~`;\~~n }\n\n if (modelSpecificOptions.dataSource) {\n ~~modelCommand += ` --~~data-source=${modelSpecificOptions.dataSource}~~`;\~~n }\n\n if (modelSpecificOptions.modelEnableSoftDelete) {\n ~~modelCommand += ` --~~model-enable-soft-delete=${modelSpecificOptions.modelEnableSoftDelete}~~`;\~~n }\n\n if (modelSpecificOptions.parentModel) {\n ~~modelCommand += ` --~~parent-model=${modelSpecificOptions.parentModel}~~`;\~~n }\n if (modelSpecificOptions.parentModule) {\n ~~modelCommand += ` --~~parent-module=${modelSpecificOptions.parentModule}~~`;\~~n }\n\n if (modelSpecificOptions.draftPublishWorkflowEnabled) {\n ~~modelCommand += ` --~~draft-publish-workflow-enabled=${modelSpecificOptions.draftPublishWorkflowEnabled}~~`;\~~n }\n\n if (modelSpecificOptions.isLegacyTable) {\n ~~modelCommand += ` --~~is-legacy-table=${modelSpecificOptions.isLegacyTable}~~`;\~~n }\n\n if (modelSpecificOptions.isLegacyTableWithId) {\n ~~modelCommand += ` --~~is-legacy-table-with-id=${modelSpecificOptions.isLegacyTableWithId}~~`;\~~n }\n\n if (modelSpecificOptions.dataSourceType) {\n ~~modelCommand += ` --~~data-source-type=${modelSpecificOptions.dataSourceType}~~`;\~~n }\n \n return ~~modelCommand~~;\n }\n}\n"]}
1	+ {"version":3,"file":"schematic.service.js","sourceRoot":"","sources":["../../src/helpers/schematic.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, Logger } from '@nestjs/common';\nimport { snakeCase } from \"lodash\";\nimport { FieldMetadata } from 'src/entities/field-metadata.entity';\nimport { CommandService, CommandWithArgs } from './command.service';\nimport { SolidRegistry } from './solid-registry';\n\nexport const ADD_MODULE_COMMAND = 'add-module';\nexport type GenerateModuleOptions = {\n module: string;\n};\ntype ModelGenerationOptions = Omit<ModelAndFieldGenerationOptions, 'fields'>;\n\ntype ModelAndFieldGenerationOptions = {\n module: string;\n model: string;\n moduleDisplayName: string;\n table?: string;\n dataSource: string;\n modelEnableSoftDelete?: boolean;\n parentModel?: string;\n parentModule?: string;\n draftPublishWorkflowEnabled?: boolean;\n isLegacyTable?: boolean;\n isLegacyTableWithId?: boolean;\n dataSourceType?: string;\n fields: FieldMetadata[]; //FIXME This type can be improved\n};\nexport const REMOVE_FIELDS_COMMAND = 'remove-fields';\nexport const REFRESH_MODEL_COMMAND = 'refresh-model';\n\n//TODO Rename to CodeBuilder service\n@Injectable()\nexport class SchematicService {\n private readonly logger = new Logger(SchematicService.name);\n private readonly SCHEMATIC_PROJECT = '@solidstarters/solid-code-builder';\n private readonly SCHEMATICS_COMMAND = 'schematics';\n\n constructor(private readonly commandService: CommandService, private readonly solidRegistry: SolidRegistry) { }\n\n async executeSchematicCommand(\n command: string,\n options: GenerateModuleOptions \| ModelAndFieldGenerationOptions,\n debug = false,\n ): Promise<string> {\n const commandWithArgs = this.generateSchematicCommand(command, options, debug);\n return await this.commandService.executeCommandWithArgs(commandWithArgs);\n }\n\n private generateSchematicCommand(\n command: string,\n options: GenerateModuleOptions \| ModelAndFieldGenerationOptions,\n debug: boolean,\n ): CommandWithArgs {\n const schematicName = `${this.SCHEMATIC_PROJECT}:${command}`;\n const baseArgs = [schematicName, `--debug=${debug}`];\n\n if (\n command === REMOVE_FIELDS_COMMAND \|\|\n command === REFRESH_MODEL_COMMAND\n ) {\n const { fields, ...modelSpecificOptions } = options as ModelAndFieldGenerationOptions;\n const modelArgs = this.buildModelGenerationArgs(modelSpecificOptions);\n const fieldArgs = this.buildFieldGenerationArgs(fields);\n const args = [...baseArgs, ...modelArgs, ...fieldArgs];\n this.logger.debug('schematicCommand args', args);\n return { command: this.SCHEMATICS_COMMAND, args };\n } else if (command === ADD_MODULE_COMMAND) {\n const moduleOptions = options as GenerateModuleOptions;\n const args = [...baseArgs, `--module=${moduleOptions.module}`];\n this.logger.debug('schematicCommand args', args);\n return { command: this.SCHEMATICS_COMMAND, args };\n } else {\n throw new Error('Schematic command not supported.');\n }\n }\n\n private buildFieldGenerationArgs(fields: FieldMetadata[]): string[] {\n return fields\n .filter((field) => {\n return !this.solidRegistry.getCommonEntityKeys().map(key => key.toString()).includes(field.name);\n })\n .map((field) => {\n // Using argument array eliminates the need for shell-specific quoting\n return `--fields=${JSON.stringify(field)}`;\n });\n }\n\n private buildModelGenerationArgs(modelSpecificOptions: ModelGenerationOptions): string[] {\n const args: string[] = [\n `--module=${modelSpecificOptions.module}`,\n `--model=${modelSpecificOptions.model}`,\n ];\n\n if (modelSpecificOptions.moduleDisplayName) {\n args.push(`--module-display-name=${snakeCase(modelSpecificOptions.moduleDisplayName)}`);\n }\n\n if (modelSpecificOptions.table) {\n args.push(`--table=${modelSpecificOptions.table}`);\n }\n\n if (modelSpecificOptions.dataSource) {\n args.push(`--data-source=${modelSpecificOptions.dataSource}`);\n }\n\n if (modelSpecificOptions.modelEnableSoftDelete) {\n args.push(`--model-enable-soft-delete=${modelSpecificOptions.modelEnableSoftDelete}`);\n }\n\n if (modelSpecificOptions.parentModel) {\n args.push(`--parent-model=${modelSpecificOptions.parentModel}`);\n }\n\n if (modelSpecificOptions.parentModule) {\n args.push(`--parent-module=${modelSpecificOptions.parentModule}`);\n }\n\n if (modelSpecificOptions.draftPublishWorkflowEnabled) {\n args.push(`--draft-publish-workflow-enabled=${modelSpecificOptions.draftPublishWorkflowEnabled}`);\n }\n\n if (modelSpecificOptions.isLegacyTable) {\n args.push(`--is-legacy-table=${modelSpecificOptions.isLegacyTable}`);\n }\n\n if (modelSpecificOptions.isLegacyTableWithId) {\n args.push(`--is-legacy-table-with-id=${modelSpecificOptions.isLegacyTableWithId}`);\n }\n\n if (modelSpecificOptions.dataSourceType) {\n args.push(`--data-source-type=${modelSpecificOptions.dataSourceType}`);\n }\n\n return args;\n }\n}\n"]}

package/dist/repository/scheduled-job.repository.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"scheduled-job.repository.d.ts","sourceRoot":"","sources":["../../src/repository/scheduled-job.repository.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAmB9D,qBACa,sBAAuB,SAAQ,mBAAmB,CAAC,YAAY,CAAC;IAErE,QAAQ,CAAC,UAAU,EAAE,UAAU;IAC/B,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB;gBAF9C,UAAU,EAAE,UAAU,EACtB,qBAAqB,EAAE,qBAAqB,EAC5C,sBAAsB,EAAE,sBAAsB;IAQvD,KAAK,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,qBAAqB,CAAC;~~IAoCjE~~,aAAa,CAAC,GAAG,EAAE,qBAAqB,GAAG,OAAO,CAAC,YAAY,CAAC;CA4BvE"}
1	+ {"version":3,"file":"scheduled-job.repository.d.ts","sourceRoot":"","sources":["../../src/repository/scheduled-job.repository.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAmB9D,qBACa,sBAAuB,SAAQ,mBAAmB,CAAC,YAAY,CAAC;IAErE,QAAQ,CAAC,UAAU,EAAE,UAAU;IAC/B,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB;gBAF9C,UAAU,EAAE,UAAU,EACtB,qBAAqB,EAAE,qBAAqB,EAC5C,sBAAsB,EAAE,sBAAsB;IAQvD,KAAK,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAqCjE,aAAa,CAAC,GAAG,EAAE,qBAAqB,GAAG,OAAO,CAAC,YAAY,CAAC;CA4BvE"}

package/dist/repository/scheduled-job.repository.js CHANGED Viewed

@@ -54,6 +54,7 @@ let ScheduledJobRepository = class ScheduledJobRepository extends solid_base_rep
             job: populatedScheduledJob.job,
             moduleUserKey: populatedScheduledJob.module.name,
             moduleId: populatedScheduledJob.module.id,
+            cronExpression: populatedScheduledJob.cronExpression,
         };
     }
     async upsertWithDto(dto) {