@solidxai/code-builder 0.1.5 → 0.1.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +11 -0
- package/CLAUDE.md +18 -0
- package/dist/code-builder/lib/field/decorator-managers/dto/RegexDecoratorManager.js +11 -1
- package/dist/code-builder/lib/field/decorator-managers/dto/RegexDecoratorManager.js.map +1 -1
- package/dist/code-builder/lib/field/field-managers/long-text/LongTextFieldManagerForEntity.js +26 -19
- package/dist/code-builder/lib/field/field-managers/long-text/LongTextFieldManagerForEntity.js.map +1 -1
- package/dist/code-builder/lib/field/field-managers/rich-text/RichTextFieldManagerForEntity.js +26 -19
- package/dist/code-builder/lib/field/field-managers/rich-text/RichTextFieldManagerForEntity.js.map +1 -1
- package/package.json +1 -1
- package/src/code-builder/lib/field/decorator-managers/dto/RegexDecoratorManager.ts +16 -1
- package/src/code-builder/lib/field/field-managers/long-text/LongTextFieldManagerForEntity.ts +27 -27
- package/src/code-builder/lib/field/field-managers/rich-text/RichTextFieldManagerForEntity.ts +27 -27
package/CHANGELOG.md
ADDED
package/CLAUDE.md
ADDED
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
# This is the SolidX API project.
|
|
2
|
+
This is included as a dependency in consuming projects.
|
|
3
|
+
|
|
4
|
+
# SolidX UI
|
|
5
|
+
# The corresponding UI project is at the below path:
|
|
6
|
+
/Users/oswald/projects/Solid_Starters/solid-core-ui
|
|
7
|
+
|
|
8
|
+
# SolidX Docs
|
|
9
|
+
# The documentation project is at the below path:
|
|
10
|
+
/Users/oswald/projects/solidxai-docs
|
|
11
|
+
|
|
12
|
+
# SolidX Agent
|
|
13
|
+
# The agent project which has the skills for helping users configure, build and use SolidX is at the below path:
|
|
14
|
+
/Users/oswald/projects/Solid_Starters/agent
|
|
15
|
+
|
|
16
|
+
# SolidX Control Plane Commands
|
|
17
|
+
# The control plane commands for managing SolidX instances are in the below path:
|
|
18
|
+
/Users/oswald/projects/Solid_Starters/solidctl
|
|
@@ -74,9 +74,19 @@ class RegexDecoratorManager {
|
|
|
74
74
|
throw new Error('Regex decorator 2nd argument must be an object literal containing the validation options');
|
|
75
75
|
}
|
|
76
76
|
const existingObjectLiteralExpression = existingCallExpression.arguments[1];
|
|
77
|
-
|
|
77
|
+
// Copy all existing options except 'message' (will be overwritten from metadata below)
|
|
78
|
+
validationOptions.push(...existingObjectLiteralExpression.properties.filter(p => {
|
|
79
|
+
var _a;
|
|
80
|
+
const name = (_a = p.name) === null || _a === void 0 ? void 0 : _a.text;
|
|
81
|
+
return name !== 'message';
|
|
82
|
+
}));
|
|
78
83
|
}
|
|
79
84
|
}
|
|
85
|
+
// Upsert the message property from current metadata
|
|
86
|
+
const notMatchingErrorMsg = this.options.regexPatternNotMatchingErrorMsg;
|
|
87
|
+
if (notMatchingErrorMsg && notMatchingErrorMsg.trim().length > 0) {
|
|
88
|
+
validationOptions.push(typescript_1.default.factory.createPropertyAssignment(typescript_1.default.factory.createIdentifier('message'), typescript_1.default.factory.createStringLiteral(notMatchingErrorMsg)));
|
|
89
|
+
}
|
|
80
90
|
// Re-create the column decorator with the merged column decorator options
|
|
81
91
|
const decoratorIdentifier = typescript_1.default.factory.createIdentifier("Matches");
|
|
82
92
|
const argumentsArray = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RegexDecoratorManager.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/decorator-managers/dto/RegexDecoratorManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"RegexDecoratorManager.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/decorator-managers/dto/RegexDecoratorManager.ts"],"names":[],"mappings":"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"}
|
package/dist/code-builder/lib/field/field-managers/long-text/LongTextFieldManagerForEntity.js
CHANGED
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.LongTextFieldManagerForEntity = void 0;
|
|
7
7
|
const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
|
|
8
8
|
const BaseFieldManagerForEntity_1 = require("../base/BaseFieldManagerForEntity");
|
|
9
|
-
const db_helpers_1 = require("../../db-helpers");
|
|
10
9
|
//FIXME Implementation pending
|
|
11
10
|
class LongTextFieldManagerForEntity extends BaseFieldManagerForEntity_1.BaseFieldManagerForEntity {
|
|
12
11
|
constructor(tree, moduleName, modelName, field, modelEnableSoftDelete, dataSourceType) {
|
|
@@ -22,30 +21,38 @@ class LongTextFieldManagerForEntity extends BaseFieldManagerForEntity_1.BaseFiel
|
|
|
22
21
|
var _a, _b;
|
|
23
22
|
const options = new Map();
|
|
24
23
|
//console.log(`Configuring LongText field with max length ${this.field.max} for database ${this.dataSourceType}`);
|
|
25
|
-
if (this.field.max) {
|
|
26
|
-
|
|
27
|
-
|
|
24
|
+
// if (this.field.max) {
|
|
25
|
+
// options.set('length', transformColumnOptionForDatabase(
|
|
26
|
+
// 'length',
|
|
27
|
+
// this.field.max,
|
|
28
|
+
// this.field.ormType,
|
|
29
|
+
// this.dataSourceType,
|
|
30
|
+
// )
|
|
31
|
+
// );
|
|
32
|
+
// }
|
|
28
33
|
options.set('default', (_b = (_a = this.defaultValueInitializer(this.field.defaultValue)) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : null);
|
|
29
34
|
return options;
|
|
30
35
|
}
|
|
31
36
|
additionalColumnDecoratorOptionExpressions() {
|
|
32
37
|
var _a, _b;
|
|
33
38
|
const options = new Map();
|
|
34
|
-
if (this.field.max) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
}
|
|
39
|
+
// if (this.field.max) {
|
|
40
|
+
// const lengthValue = transformColumnOptionForDatabase(
|
|
41
|
+
// 'length',
|
|
42
|
+
// this.field.max,
|
|
43
|
+
// this.field.ormType,
|
|
44
|
+
// this.dataSourceType,
|
|
45
|
+
// );
|
|
46
|
+
// if (typeof lengthValue === 'number') {
|
|
47
|
+
// options.set('length', ts.factory.createNumericLiteral(lengthValue));
|
|
48
|
+
// } else if (typeof lengthValue === 'string') {
|
|
49
|
+
// options.set('length', ts.factory.createStringLiteral(lengthValue));
|
|
50
|
+
// } else {
|
|
51
|
+
// options.set('length', null);
|
|
52
|
+
// }
|
|
53
|
+
// } else {
|
|
54
|
+
// options.set('length', null);
|
|
55
|
+
// }
|
|
49
56
|
options.set('default', (_b = (_a = this.defaultValueInitializer(this.field.defaultValue)) === null || _a === void 0 ? void 0 : _a.expression) !== null && _b !== void 0 ? _b : null);
|
|
50
57
|
return options;
|
|
51
58
|
}
|
package/dist/code-builder/lib/field/field-managers/long-text/LongTextFieldManagerForEntity.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LongTextFieldManagerForEntity.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/long-text/LongTextFieldManagerForEntity.ts"],"names":[],"mappings":";;;;;;AACA,gIAAgG;AAEhG,iFAA8E;
|
|
1
|
+
{"version":3,"file":"LongTextFieldManagerForEntity.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/long-text/LongTextFieldManagerForEntity.ts"],"names":[],"mappings":";;;;;;AACA,gIAAgG;AAEhG,iFAA8E;AAG9E,8BAA8B;AAC9B,MAAa,6BACX,SAAQ,qDAAyB;IAIjC,YAAY,IAAU,EAAE,UAAkB,EAAE,SAAiB,EAAE,KAAU,EAAE,qBAA0B,EAAE,cAAmC;QACxI,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,qBAAqB,EAAE,cAAc,CAAC,CAAC;IACnF,CAAC;IAED,SAAS;QACP,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,MAAW,EAAE,EAAE,CAAC,oBAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC;SACrF,CAAC;IACJ,CAAC;IAEkB,gCAAgC;;QACjD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAe,CAAC;QACvC,kHAAkH;QAClH,wBAAwB;QACxB,4DAA4D;QAC5D,gBAAgB;QAChB,sBAAsB;QACtB,0BAA0B;QAC1B,2BAA2B;QAC3B,MAAM;QACN,OAAO;QACP,IAAI;QAEJ,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,MAAA,MAAA,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,0CAAE,KAAK,mCAAI,IAAI,CAAC,CAAC;QAC7F,OAAO,OAAO,CAAC;IACjB,CAAC;IAEkB,0CAA0C;;QAC3D,MAAM,OAAO,GAAG,IAAI,GAAG,EAAgC,CAAC;QACxD,wBAAwB;QACxB,0DAA0D;QAC1D,gBAAgB;QAChB,sBAAsB;QACtB,0BAA0B;QAC1B,2BAA2B;QAC3B,OAAO;QAEP,2CAA2C;QAC3C,2EAA2E;QAC3E,kDAAkD;QAClD,0EAA0E;QAC1E,aAAa;QACb,mCAAmC;QACnC,MAAM;QACN,WAAW;QACX,iCAAiC;QACjC,IAAI;QAEJ,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,MAAA,MAAA,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,0CAAE,UAAU,mCAAI,IAAI,CAAC,CAAC;QAClG,OAAO,OAAO,CAAA;IAChB,CAAC;CAEF;AA1DD,sEA0DC"}
|
package/dist/code-builder/lib/field/field-managers/rich-text/RichTextFieldManagerForEntity.js
CHANGED
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.RichTextFieldManagerForEntity = void 0;
|
|
7
7
|
const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
|
|
8
8
|
const BaseFieldManagerForEntity_1 = require("../base/BaseFieldManagerForEntity");
|
|
9
|
-
const db_helpers_1 = require("../../db-helpers");
|
|
10
9
|
//FIXME Implementation pending
|
|
11
10
|
class RichTextFieldManagerForEntity extends BaseFieldManagerForEntity_1.BaseFieldManagerForEntity {
|
|
12
11
|
constructor(tree, moduleName, modelName, field, modelEnableSoftDelete, dataSourceType) {
|
|
@@ -21,30 +20,38 @@ class RichTextFieldManagerForEntity extends BaseFieldManagerForEntity_1.BaseFiel
|
|
|
21
20
|
additionalColumnDecoratorOptions() {
|
|
22
21
|
var _a, _b;
|
|
23
22
|
const options = new Map();
|
|
24
|
-
if (this.field.max) {
|
|
25
|
-
|
|
26
|
-
|
|
23
|
+
// if (this.field.max) {
|
|
24
|
+
// options.set('length', transformColumnOptionForDatabase(
|
|
25
|
+
// 'length',
|
|
26
|
+
// this.field.max,
|
|
27
|
+
// this.field.ormType,
|
|
28
|
+
// this.dataSourceType,
|
|
29
|
+
// )
|
|
30
|
+
// );
|
|
31
|
+
// }
|
|
27
32
|
options.set('default', (_b = (_a = this.defaultValueInitializer(this.field.defaultValue)) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : null);
|
|
28
33
|
return options;
|
|
29
34
|
}
|
|
30
35
|
additionalColumnDecoratorOptionExpressions() {
|
|
31
36
|
var _a, _b;
|
|
32
37
|
const options = new Map();
|
|
33
|
-
if (this.field.max) {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
}
|
|
38
|
+
// if (this.field.max) {
|
|
39
|
+
// const lengthValue = transformColumnOptionForDatabase(
|
|
40
|
+
// 'length',
|
|
41
|
+
// this.field.max,
|
|
42
|
+
// this.field.ormType,
|
|
43
|
+
// this.dataSourceType,
|
|
44
|
+
// );
|
|
45
|
+
// if (typeof lengthValue === 'number') {
|
|
46
|
+
// options.set('length', ts.factory.createNumericLiteral(lengthValue));
|
|
47
|
+
// } else if (typeof lengthValue === 'string') {
|
|
48
|
+
// options.set('length', ts.factory.createStringLiteral(lengthValue));
|
|
49
|
+
// } else {
|
|
50
|
+
// options.set('length', null);
|
|
51
|
+
// }
|
|
52
|
+
// } else {
|
|
53
|
+
// options.set('length', null);
|
|
54
|
+
// }
|
|
48
55
|
options.set('default', (_b = (_a = this.defaultValueInitializer(this.field.defaultValue)) === null || _a === void 0 ? void 0 : _a.expression) !== null && _b !== void 0 ? _b : null);
|
|
49
56
|
return options;
|
|
50
57
|
}
|
package/dist/code-builder/lib/field/field-managers/rich-text/RichTextFieldManagerForEntity.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RichTextFieldManagerForEntity.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/rich-text/RichTextFieldManagerForEntity.ts"],"names":[],"mappings":";;;;;;AACA,gIAAgG;AAEhG,iFAA8E;
|
|
1
|
+
{"version":3,"file":"RichTextFieldManagerForEntity.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/rich-text/RichTextFieldManagerForEntity.ts"],"names":[],"mappings":";;;;;;AACA,gIAAgG;AAEhG,iFAA8E;AAG9E,8BAA8B;AAC9B,MAAa,6BACX,SAAQ,qDAAyB;IAIjC,YAAY,IAAU,EAAE,UAAkB,EAAE,SAAiB,EAAE,KAAU,EAAE,qBAA0B,EAAE,cAAmC;QACxI,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,qBAAqB,EAAE,cAAc,CAAC,CAAC;IACnF,CAAC;IAED,SAAS;QACP,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,MAAW,EAAE,EAAE,CAAC,oBAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC;SACrF,CAAC;IACJ,CAAC;IAEkB,gCAAgC;;QACjD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAe,CAAC;QACvC,wBAAwB;QACxB,4DAA4D;QAC5D,gBAAgB;QAChB,sBAAsB;QACtB,0BAA0B;QAC1B,2BAA2B;QAC3B,MAAM;QACN,OAAO;QACP,IAAI;QACJ,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,MAAA,MAAA,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,0CAAE,KAAK,mCAAI,IAAI,CAAC,CAAC;QAC7F,OAAO,OAAO,CAAC;IACjB,CAAC;IAEkB,0CAA0C;;QAC3D,MAAM,OAAO,GAAG,IAAI,GAAG,EAAgC,CAAC;QACxD,wBAAwB;QACxB,0DAA0D;QAC1D,gBAAgB;QAChB,sBAAsB;QACtB,0BAA0B;QAC1B,2BAA2B;QAC3B,OAAO;QAEP,2CAA2C;QAC3C,2EAA2E;QAC3E,kDAAkD;QAClD,0EAA0E;QAC1E,aAAa;QACb,mCAAmC;QACnC,MAAM;QACN,WAAW;QACX,iCAAiC;QACjC,IAAI;QACJ,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,MAAA,MAAA,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,0CAAE,UAAU,mCAAI,IAAI,CAAC,CAAC;QAClG,OAAO,OAAO,CAAA;IAChB,CAAC;CAEF;AAvDD,sEAuDC"}
|
package/package.json
CHANGED
|
@@ -90,10 +90,25 @@ export class RegexDecoratorManager implements DecoratorManager {
|
|
|
90
90
|
if (existingCallExpression.arguments.length > 1) {
|
|
91
91
|
if (!ts.isObjectLiteralExpression(existingCallExpression.arguments[1])) { throw new Error('Regex decorator 2nd argument must be an object literal containing the validation options'); }
|
|
92
92
|
const existingObjectLiteralExpression = existingCallExpression.arguments[1] as ts.ObjectLiteralExpression;
|
|
93
|
-
|
|
93
|
+
// Copy all existing options except 'message' (will be overwritten from metadata below)
|
|
94
|
+
validationOptions.push(...existingObjectLiteralExpression.properties.filter(p => {
|
|
95
|
+
const name = (p.name as ts.Identifier)?.text;
|
|
96
|
+
return name !== 'message';
|
|
97
|
+
}));
|
|
94
98
|
}
|
|
95
99
|
}
|
|
96
100
|
|
|
101
|
+
// Upsert the message property from current metadata
|
|
102
|
+
const notMatchingErrorMsg = this.options.regexPatternNotMatchingErrorMsg;
|
|
103
|
+
if (notMatchingErrorMsg && notMatchingErrorMsg.trim().length > 0) {
|
|
104
|
+
validationOptions.push(
|
|
105
|
+
ts.factory.createPropertyAssignment(
|
|
106
|
+
ts.factory.createIdentifier('message'),
|
|
107
|
+
ts.factory.createStringLiteral(notMatchingErrorMsg)
|
|
108
|
+
)
|
|
109
|
+
);
|
|
110
|
+
}
|
|
111
|
+
|
|
97
112
|
// Re-create the column decorator with the merged column decorator options
|
|
98
113
|
const decoratorIdentifier = ts.factory.createIdentifier("Matches");
|
|
99
114
|
const argumentsArray: ts.Expression[] = [];
|
package/src/code-builder/lib/field/field-managers/long-text/LongTextFieldManagerForEntity.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { Tree } from '@angular-devkit/schematics';
|
|
|
2
2
|
import ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
|
|
3
3
|
import { FieldManager, FieldType } from '../../FieldManager';
|
|
4
4
|
import { BaseFieldManagerForEntity } from '../base/BaseFieldManagerForEntity';
|
|
5
|
-
import { SupportedDatabases
|
|
5
|
+
import { SupportedDatabases } from '../../db-helpers';
|
|
6
6
|
|
|
7
7
|
//FIXME Implementation pending
|
|
8
8
|
export class LongTextFieldManagerForEntity
|
|
@@ -24,15 +24,15 @@ export class LongTextFieldManagerForEntity
|
|
|
24
24
|
protected override additionalColumnDecoratorOptions(): Map<string, any> {
|
|
25
25
|
const options = new Map<string, any>();
|
|
26
26
|
//console.log(`Configuring LongText field with max length ${this.field.max} for database ${this.dataSourceType}`);
|
|
27
|
-
if (this.field.max) {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
}
|
|
27
|
+
// if (this.field.max) {
|
|
28
|
+
// options.set('length', transformColumnOptionForDatabase(
|
|
29
|
+
// 'length',
|
|
30
|
+
// this.field.max,
|
|
31
|
+
// this.field.ormType,
|
|
32
|
+
// this.dataSourceType,
|
|
33
|
+
// )
|
|
34
|
+
// );
|
|
35
|
+
// }
|
|
36
36
|
|
|
37
37
|
options.set('default', this.defaultValueInitializer(this.field.defaultValue)?.value ?? null);
|
|
38
38
|
return options;
|
|
@@ -40,24 +40,24 @@ export class LongTextFieldManagerForEntity
|
|
|
40
40
|
|
|
41
41
|
protected override additionalColumnDecoratorOptionExpressions(): Map<string, ts.Expression | null> {
|
|
42
42
|
const options = new Map<string, ts.Expression | null>();
|
|
43
|
-
if (this.field.max) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
43
|
+
// if (this.field.max) {
|
|
44
|
+
// const lengthValue = transformColumnOptionForDatabase(
|
|
45
|
+
// 'length',
|
|
46
|
+
// this.field.max,
|
|
47
|
+
// this.field.ormType,
|
|
48
|
+
// this.dataSourceType,
|
|
49
|
+
// );
|
|
50
50
|
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
} else {
|
|
59
|
-
|
|
60
|
-
}
|
|
51
|
+
// if (typeof lengthValue === 'number') {
|
|
52
|
+
// options.set('length', ts.factory.createNumericLiteral(lengthValue));
|
|
53
|
+
// } else if (typeof lengthValue === 'string') {
|
|
54
|
+
// options.set('length', ts.factory.createStringLiteral(lengthValue));
|
|
55
|
+
// } else {
|
|
56
|
+
// options.set('length', null);
|
|
57
|
+
// }
|
|
58
|
+
// } else {
|
|
59
|
+
// options.set('length', null);
|
|
60
|
+
// }
|
|
61
61
|
|
|
62
62
|
options.set('default', this.defaultValueInitializer(this.field.defaultValue)?.expression ?? null);
|
|
63
63
|
return options
|
package/src/code-builder/lib/field/field-managers/rich-text/RichTextFieldManagerForEntity.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { Tree } from '@angular-devkit/schematics';
|
|
|
2
2
|
import ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
|
|
3
3
|
import { FieldManager, FieldType } from '../../FieldManager';
|
|
4
4
|
import { BaseFieldManagerForEntity } from '../base/BaseFieldManagerForEntity';
|
|
5
|
-
import { SupportedDatabases
|
|
5
|
+
import { SupportedDatabases } from '../../db-helpers';
|
|
6
6
|
|
|
7
7
|
//FIXME Implementation pending
|
|
8
8
|
export class RichTextFieldManagerForEntity
|
|
@@ -23,39 +23,39 @@ export class RichTextFieldManagerForEntity
|
|
|
23
23
|
|
|
24
24
|
protected override additionalColumnDecoratorOptions(): Map<string, any> {
|
|
25
25
|
const options = new Map<string, any>();
|
|
26
|
-
if (this.field.max) {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
}
|
|
26
|
+
// if (this.field.max) {
|
|
27
|
+
// options.set('length', transformColumnOptionForDatabase(
|
|
28
|
+
// 'length',
|
|
29
|
+
// this.field.max,
|
|
30
|
+
// this.field.ormType,
|
|
31
|
+
// this.dataSourceType,
|
|
32
|
+
// )
|
|
33
|
+
// );
|
|
34
|
+
// }
|
|
35
35
|
options.set('default', this.defaultValueInitializer(this.field.defaultValue)?.value ?? null);
|
|
36
36
|
return options;
|
|
37
37
|
}
|
|
38
38
|
|
|
39
39
|
protected override additionalColumnDecoratorOptionExpressions(): Map<string, ts.Expression | null> {
|
|
40
40
|
const options = new Map<string, ts.Expression | null>();
|
|
41
|
-
if (this.field.max) {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
41
|
+
// if (this.field.max) {
|
|
42
|
+
// const lengthValue = transformColumnOptionForDatabase(
|
|
43
|
+
// 'length',
|
|
44
|
+
// this.field.max,
|
|
45
|
+
// this.field.ormType,
|
|
46
|
+
// this.dataSourceType,
|
|
47
|
+
// );
|
|
48
48
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
} else {
|
|
57
|
-
|
|
58
|
-
}
|
|
49
|
+
// if (typeof lengthValue === 'number') {
|
|
50
|
+
// options.set('length', ts.factory.createNumericLiteral(lengthValue));
|
|
51
|
+
// } else if (typeof lengthValue === 'string') {
|
|
52
|
+
// options.set('length', ts.factory.createStringLiteral(lengthValue));
|
|
53
|
+
// } else {
|
|
54
|
+
// options.set('length', null);
|
|
55
|
+
// }
|
|
56
|
+
// } else {
|
|
57
|
+
// options.set('length', null);
|
|
58
|
+
// }
|
|
59
59
|
options.set('default', this.defaultValueInitializer(this.field.defaultValue)?.expression ?? null);
|
|
60
60
|
return options
|
|
61
61
|
}
|